summaryrefslogtreecommitdiffstats
path: root/core/base_rules.mk
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Disable "-t" for acp.Ying Wang2011-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Acp can not handle high resolution file timestamp on ext4. We need this to fix incremental build on ext4. Change-Id: I54e45c73ffa44c4253c7a431375d419fa4dccfd9
* | | | Add framework includes for any aidl source.Ying Wang2010-12-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, only aidl in apps gets the framework directories in their include path. Change-Id: Ieeaa162f577ea280fe71e4959cc73176b4dfd8ad
* | | | am 1f22360f: am c7973678: Merge "Default uninstallable modules\' tag to ↵Ying Wang2010-12-101-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | optional" into gingerbread * commit '1f22360f60455ff9a486a6c757d1b974341c1895': Default uninstallable modules' tag to optional
| * | | am c7973678: Merge "Default uninstallable modules\' tag to optional" into ↵Ying Wang2010-12-101-1/+5
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | gingerbread * commit 'c79736785716d56768998d64317ff90a62073868': Default uninstallable modules' tag to optional
| | * Default uninstallable modules' tag to optionalYing Wang2010-12-101-1/+5
| | | | | | | | | | | | Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
* | | Allow module-specific protoc flags.Ying Wang2010-11-051-0/+1
| | | | | | | | | | | | | | | | | | You can add local protoc flags via LOCAL_PROTOC_FLAGS. Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
* | | Set the correct proto intermediate dir for native modules.Ying Wang2010-11-051-0/+5
| | | | | | | | | | | | Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
* | | Integrate protocol buffer compiler into the build system.Ying Wang2010-11-021-0/+32
| | | | | | | | | | | | | | | Bug: 3152546 Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
* | | am b7019e21: am a9c381ed: Any intermediate targets between Progaurd and the ↵Ying Wang2010-10-021-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | built_dex should be differently named. Merge commit 'b7019e2147173a962febeab0e0693cdec9f80789' * commit 'b7019e2147173a962febeab0e0693cdec9f80789': Any intermediate targets between Progaurd and the built_dex should be differently named.
| * | am a9c381ed: Any intermediate targets between Progaurd and the built_dex ↵Ying Wang2010-10-021-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | should be differently named. Merge commit 'a9c381ed4517993175a5bb6741ecf2aac3e8040c' into gingerbread-plus-aosp * commit 'a9c381ed4517993175a5bb6741ecf2aac3e8040c': Any intermediate targets between Progaurd and the built_dex should be differently named.
| | * Any intermediate targets between Progaurd and the built_dex should be ↵Ying Wang2010-10-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | differently named. Change-Id: Ifb01b1fcf24ba0c5b98aa02dd604cd81918e1841 To do that, we have to move classes.jar step before proguard, so classes.jar is always with the full names.
* | | am bf2ed191: am a83940fa: Move odex related files to product-specific dir.Ying Wang2010-10-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637' * commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637': Move odex related files to product-specific dir.
| * | am a83940fa: Move odex related files to product-specific dir.Ying Wang2010-10-011-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'a83940fa7851b35712e559be2246b56b5666b805' into gingerbread-plus-aosp * commit 'a83940fa7851b35712e559be2246b56b5666b805': Move odex related files to product-specific dir.
| | * Move odex related files to product-specific dir.Ying Wang2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar and the .odex file, if dexpreopt is enabled. These 2 files are moved to a product-specific dir in this change. For target Java Libraries, $(intermediates) now points to the product-specific dir. There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency. Nothing is changed for host Java libraries. Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
* | | am c292927f: am e1926260: Treat prebuilt SDKs and the stub as normal java ↵Ying Wang2010-09-281-12/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | libraries. Merge commit 'c292927f05ff6955b1e5ffe40b8b9777328eba55' * commit 'c292927f05ff6955b1e5ffe40b8b9777328eba55': Treat prebuilt SDKs and the stub as normal java libraries.
| * | am e1926260: Treat prebuilt SDKs and the stub as normal java libraries.Ying Wang2010-09-281-12/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'e1926260486707b3941b5488e97307f7904d1c99' into gingerbread-plus-aosp * commit 'e1926260486707b3941b5488e97307f7904d1c99': Treat prebuilt SDKs and the stub as normal java libraries.
| | * Treat prebuilt SDKs and the stub as normal java libraries.Ying Wang2010-09-281-12/+0
| | | | | | | | | | | | Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d
* | | am d60ab565: am 19f9c1c2: Fix nothing-to-do build.Ying Wang2010-09-241-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088' * commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088': Fix nothing-to-do build.
| * | am 19f9c1c2: Fix nothing-to-do build.Ying Wang2010-09-241-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '19f9c1c243262aa3c16cba026a82ad53aa2818ac' into gingerbread-plus-aosp * commit '19f9c1c243262aa3c16cba026a82ad53aa2818ac': Fix nothing-to-do build.
| | * Fix nothing-to-do build.Ying Wang2010-09-241-1/+1
| | | | | | | | | | | | | | | | | | Because .odex is always newer than the .jar file, so we should use "|" depdendency here. Change-Id: Ied4c5ec4ee3294862c0a232f96c15cca2c748e11
* | | resolved conflicts for merge of 9f28f0d7 to masterYing Wang2010-09-221-0/+10
|\ \ \ | |/ / | | | | | | Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
| * | am e7874c43: Integrate dexpreopt into the build system.Ying Wang2010-09-221-0/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp * commit 'e7874c430895b9a4e631c89f1e7729da9264d167': Integrate dexpreopt into the build system.
| | * Integrate dexpreopt into the build system.Ying Wang2010-09-221-0/+10
| | | | | | | | | | | | Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
* | | am 05ad00ea: am 5890600d: Add a better explanation about how to deal with ↵Jean-Baptiste Queru2010-09-151-0/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | user modules Merge commit '05ad00eac9edda58c5cd3110853a6b93d6cc4e89' * commit '05ad00eac9edda58c5cd3110853a6b93d6cc4e89': Add a better explanation about how to deal with user modules
| * | am 5890600d: Add a better explanation about how to deal with user modulesJean-Baptiste Queru2010-09-151-0/+22
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '5890600dac385941b6a4c6b6d0b230c1f13d54fa' into gingerbread-plus-aosp * commit '5890600dac385941b6a4c6b6d0b230c1f13d54fa': Add a better explanation about how to deal with user modules
| | * Add a better explanation about how to deal with user modulesJean-Baptiste Queru2010-09-151-0/+22
| | | | | | | | | | | | Change-Id: Ib79cc0f4b47648daa18db97aa949cd167c8d44a9
| * | am 32afccc7: Revert "Default host module tag to optional."Jean-Baptiste Queru2010-09-141-4/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '32afccc732a6d7c631d2ba4d8a818fcbe2162903' into gingerbread-plus-aosp * commit '32afccc732a6d7c631d2ba4d8a818fcbe2162903': Revert "Default host module tag to optional."
| | * Revert "Default host module tag to optional."Jean-Baptiste Queru2010-09-141-4/+1
| | | | | | | | | | | | This reverts commit 528362f07460cfee42190e68ee2ffde4f08f0af4.
| * | am 6e8b268d: Fail the build when using a user tag on a non-legacy module. do ↵Jean-Baptiste Queru2010-09-141-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | not merge Merge commit '6e8b268dec3cc38151dfd0514621219b79a30fa9' into gingerbread-plus-aosp * commit '6e8b268dec3cc38151dfd0514621219b79a30fa9': Fail the build when using a user tag on a non-legacy module. do not merge
| | * Fail the build when using a user tag on a non-legacy module. do not mergeJean-Baptiste Queru2010-09-141-1/+3
| | | | | | | | | | | | | | | | | | | | | The supported mechanism is to explicitly add the module name to the PRODUCT_PACKAGES of the relevant product definitions. Change-Id: I67bef9a967576b77a5d6c298178f03c66722eb37
* | | Fail the build when using a user tag on a non-legacy module.Jean-Baptiste Queru2010-09-151-1/+3
| | | | | | | | | | | | | | | | | | | | | The supported mechanism is to explicitly add the module name to the PRODUCT_PACKAGES of the relevant product definitions. Change-Id: Ic754446e15965d468d1bbe85864275e2cda9b3aa
* | | Revert "Default host module tag to optional."Jean-Baptiste Queru2010-09-141-4/+1
| | | | | | | | | | | | This reverts commit 528362f07460cfee42190e68ee2ffde4f08f0af4.
* | | am 74005c3c: am 528362f0: Default host module tag to optional.Ying Wang2010-09-131-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '74005c3c2df04e035000426909a060f6149fd1d6' * commit '74005c3c2df04e035000426909a060f6149fd1d6': Default host module tag to optional.
| * | am 528362f0: Default host module tag to optional.Ying Wang2010-09-131-1/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '528362f07460cfee42190e68ee2ffde4f08f0af4' into gingerbread-plus-aosp * commit '528362f07460cfee42190e68ee2ffde4f08f0af4': Default host module tag to optional.
| | * Default host module tag to optional.Ying Wang2010-09-131-1/+4
| | | | | | | | | | | | Change-Id: I8ae572b368e7ecdcc8e5bb257bb2f6084b5fb508
* | | am 796a2df1: am 73ca57f5: Fix host-dexed libraries.Ying Wang2010-09-101-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6' * commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6': Fix host-dexed libraries.
| * | am 73ca57f5: Fix host-dexed libraries.Ying Wang2010-09-101-0/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '73ca57f5e688280599f507c10ebaf702506cc799' into gingerbread-plus-aosp * commit '73ca57f5e688280599f507c10ebaf702506cc799': Fix host-dexed libraries.
| | * Fix host-dexed libraries.Ying Wang2010-09-101-0/+5
| | | | | | | | | | | | | | | | | | | | | With this change, host-dexed library A can have host-dexed library B in its LOCAL_JAVA_LIBRARIES. Bug: 2992136 Change-Id: I794613d3230d4eb471a0566c325078da8fa38b86
| * | am a90f9d2c: Merge "Warn when new modules are found that use user tags - DO ↵Jean-Baptiste Queru2010-09-081-0/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread Merge commit 'a90f9d2c299d7833b37f8a0e244a2893054d9ea5' into gingerbread-plus-aosp * commit 'a90f9d2c299d7833b37f8a0e244a2893054d9ea5': Warn when new modules are found that use user tags - DO NOT MERGE
| | * Warn when new modules are found that use user tags - DO NOT MERGEJean-Baptiste Queru2010-09-031-0/+6
| | | | | | | | | | | | Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38
* | | Warn when new modules are found that use user tagsJean-Baptiste Queru2010-09-081-0/+6
| | | | | | | | | | | | Change-Id: I49369cc1596f269e0964f0a6a88bcc7152209bde
* | | am a79db6e4: am 3dae0ee4: Fix inherited dependency when instrmentation.Ying Wang2010-09-031-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'a79db6e47a378cb089021a56637a9c6925f14261' * commit 'a79db6e47a378cb089021a56637a9c6925f14261': Fix inherited dependency when instrmentation.
| * | am 3dae0ee4: Fix inherited dependency when instrmentation.Ying Wang2010-09-031-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671' into gingerbread-plus-aosp * commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671': Fix inherited dependency when instrmentation.
| | * Fix inherited dependency when instrmentation.Ying Wang2010-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It turns out we should also LOCAL_INSTRUMENTATION_FOR. To disambiguate LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME is renamed to LOCAL_MANIFEST_INSTRUMENTATION_FOR. Bug: 2902591 Change-Id: I6cb893c135736fc4170aa2259105b4c5eea798a1
* | | am 5f0df7a9: Manual mergeJean-Baptiste Queru2010-08-251-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1' * commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1': Add new variable TARGET_SHELL := ash (default; or mksh)
| * | Manual mergeJean-Baptiste Queru2010-08-251-1/+1
| |\ \ | | |/ | |/| | | | Change-Id: I81dd98ba150e936b675ff2323994a1e381512332
| | * Add new variable TARGET_SHELL := ash (default; or mksh)Thorsten Glaser2010-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | Besides that, add enough magic to build everything tagged as "shell_$(TARGET_SHELL)" and permit ash/mksh as not unusual Change-Id: I36c0590ba49f45251d24dc179cb27c8368c3662a
| | * default empty tapas to TARGET_BUILD_APPS "all"Ying Wang2010-06-241-0/+2
| | | | | | | | | | | | | | | | | | | | | So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch. Also, the magic "all" apps will build only apps, not other things. Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
* | | Fix jar dependency on the local manifest file.Ying Wang2010-07-201-1/+3
|/ / | | | | | | | | Change-Id: I1a868885e72c94c4b065723a8d6e890fce5ba1e0 http://b/issue?id=1444634
* | Instrumentation links against the jar file for its app, so use that at the ↵Joe Onorato2010-07-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency. I don't remember exactly, but I think the dependencies for apps were broken, and you couldn't reliably cause the java to be rebuilt by depending just on the jar file-- you needed to depend on the apk. That isn't the case anymore, and relying on the apk means that something built in out/target/common was depending on something that's deleted by installclean. With this change (and others), on my mac, the build after installclean for passion-eng takes 2 minutes instead of 11. Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc