Commit graph

84 commits

Author SHA1 Message Date
Ying Wang
a67ce69e9a Handle MODULE_LICENSE_MPL the same as MODULE_LICENSE_GPL.
Change-Id: Iefc6df3f3401a591f53ec3f22202044c60acf460
2011-03-03 14:57:10 -08:00
Jeff Brown
703e7c6d50 Build system tweaks for Valgrind.
Added LOCAL_NO_CRT to enable building executables that do not link
to the C runtime library.

Removed support for LOCAL_MODULE_SUBDIR since it was broken
and unused.  (Was going to use it but ended up using LOCAL_MODULE_PATH
instead.)

Change-Id: I3b6f5ab7e5ae6aaa7119899adccece2b4ab1cbb3
2011-02-08 16:38:56 -08:00
Ying Wang
015edd2c1b Add modifier goal incrementaljavac
With "incrementaljavac" on your make command line, you will recompile
only Java source files that have been changed since last build.
Nothing is changed if "incrementaljavac" is not among your make goals.

Change-Id: Iae591459827df81ac91e95292464db5e9828343a
2011-01-21 17:49:30 -08:00
Ying Wang
84ed6fa27b Disable "-t" for acp.
Acp can not handle high resolution file timestamp on ext4.
We need this to fix incremental build on ext4.

Change-Id: I54e45c73ffa44c4253c7a431375d419fa4dccfd9
2011-01-19 12:15:38 -08:00
Ying Wang
1214aeb75f Add framework includes for any aidl source.
Before this change, only aidl in apps gets the framework directories in
their include path.

Change-Id: Ieeaa162f577ea280fe71e4959cc73176b4dfd8ad
2010-12-14 10:57:54 -08:00
Ying Wang
953b64f48a am 1f22360f: am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit '1f22360f60455ff9a486a6c757d1b974341c1895':
  Default uninstallable modules' tag to optional
2010-12-10 16:26:59 -08:00
Ying Wang
1f22360f60 am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit 'c79736785716d56768998d64317ff90a62073868':
  Default uninstallable modules' tag to optional
2010-12-10 16:21:43 -08:00
Ying Wang
2fd81cf11e Default uninstallable modules' tag to optional
Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
2010-12-10 11:17:28 -08:00
Ying Wang
33c0d952fc Allow module-specific protoc flags.
You can add local protoc flags via LOCAL_PROTOC_FLAGS.

Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
2010-11-05 11:30:58 -07:00
Ying Wang
60293914c1 Set the correct proto intermediate dir for native modules.
Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
2010-11-05 11:20:03 -07:00
Ying Wang
a5fc87a937 Integrate protocol buffer compiler into the build system.
Bug: 3152546
Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
2010-11-02 19:25:47 -07:00
Ying Wang
25a04dadf6 am b7019e21: am a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named.
Merge commit 'b7019e2147173a962febeab0e0693cdec9f80789'

* commit 'b7019e2147173a962febeab0e0693cdec9f80789':
  Any intermediate targets between Progaurd and the built_dex should be differently named.
2010-10-02 20:10:59 -07:00
Ying Wang
b7019e2147 am a9c381ed: Any intermediate targets between Progaurd and the built_dex 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.
2010-10-02 20:08:55 -07:00
Ying Wang
a9c381ed45 Any intermediate targets between Progaurd and the built_dex should be 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.
2010-10-02 19:41:10 -07:00
Ying Wang
1406613b63 am bf2ed191: am a83940fa: Move odex related files to product-specific dir.
Merge commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637'

* commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637':
  Move odex related files to product-specific dir.
2010-10-01 17:07:29 -07:00
Ying Wang
bf2ed191fe am a83940fa: Move odex related files to product-specific dir.
Merge commit 'a83940fa7851b35712e559be2246b56b5666b805' into gingerbread-plus-aosp

* commit 'a83940fa7851b35712e559be2246b56b5666b805':
  Move odex related files to product-specific dir.
2010-10-01 15:51:35 -07:00
Ying Wang
a83940fa78 Move odex related files to product-specific dir.
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
2010-10-01 14:41:43 -07:00
Ying Wang
d46905b787 am c292927f: am e1926260: Treat prebuilt SDKs and the stub as normal java libraries.
Merge commit 'c292927f05ff6955b1e5ffe40b8b9777328eba55'

* commit 'c292927f05ff6955b1e5ffe40b8b9777328eba55':
  Treat prebuilt SDKs and the stub as normal java libraries.
2010-09-28 17:39:46 -07:00
Ying Wang
c292927f05 am e1926260: Treat prebuilt SDKs and the stub as normal java libraries.
Merge commit 'e1926260486707b3941b5488e97307f7904d1c99' into gingerbread-plus-aosp

* commit 'e1926260486707b3941b5488e97307f7904d1c99':
  Treat prebuilt SDKs and the stub as normal java libraries.
2010-09-28 16:25:15 -07:00
Ying Wang
e192626048 Treat prebuilt SDKs and the stub as normal java libraries.
Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d
2010-09-28 16:18:03 -07:00
Ying Wang
afd9652f6d am d60ab565: am 19f9c1c2: Fix nothing-to-do build.
Merge commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088'

* commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088':
  Fix nothing-to-do build.
2010-09-24 15:57:47 -07:00
Ying Wang
d60ab56596 am 19f9c1c2: Fix nothing-to-do build.
Merge commit '19f9c1c243262aa3c16cba026a82ad53aa2818ac' into gingerbread-plus-aosp

* commit '19f9c1c243262aa3c16cba026a82ad53aa2818ac':
  Fix nothing-to-do build.
2010-09-24 14:00:50 -07:00
Ying Wang
19f9c1c243 Fix nothing-to-do build.
Because .odex is always newer than the .jar file, so we should use "|" depdendency here.

Change-Id: Ied4c5ec4ee3294862c0a232f96c15cca2c748e11
2010-09-24 13:56:45 -07:00
Ying Wang
3efd768a0d resolved conflicts for merge of 9f28f0d7 to master
Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
2010-09-22 17:19:11 -07:00
Ying Wang
9f28f0d76e am e7874c43: Integrate dexpreopt into the build system.
Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp

* commit 'e7874c430895b9a4e631c89f1e7729da9264d167':
  Integrate dexpreopt into the build system.
2010-09-22 16:57:01 -07:00
Ying Wang
e7874c4308 Integrate dexpreopt into the build system.
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-22 16:51:53 -07:00
Jean-Baptiste Queru
88a873a8c5 am 05ad00ea: am 5890600d: Add a better explanation about how to deal with user modules
Merge commit '05ad00eac9edda58c5cd3110853a6b93d6cc4e89'

* commit '05ad00eac9edda58c5cd3110853a6b93d6cc4e89':
  Add a better explanation about how to deal with user modules
2010-09-15 19:02:26 -07:00
Jean-Baptiste Queru
05ad00eac9 am 5890600d: Add a better explanation about how to deal with user modules
Merge commit '5890600dac385941b6a4c6b6d0b230c1f13d54fa' into gingerbread-plus-aosp

* commit '5890600dac385941b6a4c6b6d0b230c1f13d54fa':
  Add a better explanation about how to deal with user modules
2010-09-15 14:42:46 -07:00
Jean-Baptiste Queru
5890600dac Add a better explanation about how to deal with user modules
Change-Id: Ib79cc0f4b47648daa18db97aa949cd167c8d44a9
2010-09-15 14:29:14 -07:00
Jean-Baptiste Queru
d64e5a2eef Fail the build when using a user tag on a non-legacy module.
The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.

Change-Id: Ic754446e15965d468d1bbe85864275e2cda9b3aa
2010-09-15 10:50:27 -07:00
Jean-Baptiste Queru
2b3b26f5b1 am 32afccc7: Revert "Default host module tag to optional."
Merge commit '32afccc732a6d7c631d2ba4d8a818fcbe2162903' into gingerbread-plus-aosp

* commit '32afccc732a6d7c631d2ba4d8a818fcbe2162903':
  Revert "Default host module tag to optional."
2010-09-14 13:27:46 -07:00
Jean-Baptiste Queru
423c15c25b Revert "Default host module tag to optional."
This reverts commit 528362f074.
2010-09-14 13:27:12 -07:00
Jean-Baptiste Queru
32afccc732 Revert "Default host module tag to optional."
This reverts commit 528362f074.
2010-09-14 13:25:42 -07:00
Jean-Baptiste Queru
e893cd2d5e am 6e8b268d: Fail the build when using a user tag on a non-legacy module. do 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
2010-09-14 09:44:07 -07:00
Jean-Baptiste Queru
6e8b268dec Fail the build when using a user tag on a non-legacy module. do not merge
The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.

Change-Id: I67bef9a967576b77a5d6c298178f03c66722eb37
2010-09-14 08:59:21 -07:00
Ying Wang
744e646032 am 74005c3c: am 528362f0: Default host module tag to optional.
Merge commit '74005c3c2df04e035000426909a060f6149fd1d6'

* commit '74005c3c2df04e035000426909a060f6149fd1d6':
  Default host module tag to optional.
2010-09-13 17:24:04 -07:00
Ying Wang
74005c3c2d am 528362f0: Default host module tag to optional.
Merge commit '528362f07460cfee42190e68ee2ffde4f08f0af4' into gingerbread-plus-aosp

* commit '528362f07460cfee42190e68ee2ffde4f08f0af4':
  Default host module tag to optional.
2010-09-13 15:09:25 -07:00
Ying Wang
528362f074 Default host module tag to optional.
Change-Id: I8ae572b368e7ecdcc8e5bb257bb2f6084b5fb508
2010-09-13 14:56:15 -07:00
Ying Wang
3e642c463e am 796a2df1: am 73ca57f5: Fix host-dexed libraries.
Merge commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6'

* commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6':
  Fix host-dexed libraries.
2010-09-10 18:52:51 -07:00
Ying Wang
796a2df1f4 am 73ca57f5: Fix host-dexed libraries.
Merge commit '73ca57f5e688280599f507c10ebaf702506cc799' into gingerbread-plus-aosp

* commit '73ca57f5e688280599f507c10ebaf702506cc799':
  Fix host-dexed libraries.
2010-09-10 18:49:47 -07:00
Ying Wang
73ca57f5e6 Fix host-dexed libraries.
With this change, host-dexed library A can have host-dexed library B in its LOCAL_JAVA_LIBRARIES.
Bug: 2992136

Change-Id: I794613d3230d4eb471a0566c325078da8fa38b86
2010-09-10 18:43:33 -07:00
Jean-Baptiste Queru
4074f2377c Warn when new modules are found that use user tags
Change-Id: I49369cc1596f269e0964f0a6a88bcc7152209bde
2010-09-08 12:44:06 -07:00
Jean-Baptiste Queru
6b747cfb21 am a90f9d2c: Merge "Warn when new modules are found that use user tags - DO 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
2010-09-08 10:32:52 -07:00
Jean-Baptiste Queru
39de432897 Warn when new modules are found that use user tags - DO NOT MERGE
Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38
2010-09-03 17:39:10 -07:00
Ying Wang
54b634dce8 am a79db6e4: am 3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit 'a79db6e47a378cb089021a56637a9c6925f14261'

* commit 'a79db6e47a378cb089021a56637a9c6925f14261':
  Fix inherited dependency when instrmentation.
2010-09-03 10:36:41 -07:00
Ying Wang
a79db6e47a am 3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671' into gingerbread-plus-aosp

* commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671':
  Fix inherited dependency when instrmentation.
2010-09-03 10:21:37 -07:00
Ying Wang
3dae0ee46c Fix inherited dependency when instrmentation.
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
2010-09-03 10:05:39 -07:00
Jean-Baptiste Queru
b139a445d6 am 5f0df7a9: Manual merge
Merge commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1'

* commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1':
  Add new variable TARGET_SHELL := ash (default; or mksh)
2010-08-25 09:59:53 -07:00
Jean-Baptiste Queru
5f0df7a95b Manual merge
Change-Id: I81dd98ba150e936b675ff2323994a1e381512332
2010-08-25 09:52:07 -07:00
Thorsten Glaser
2213aab8b9 Add new variable TARGET_SHELL := ash (default; or mksh)
Besides that, add enough magic to build everything tagged
as "shell_$(TARGET_SHELL)" and permit ash/mksh as not unusual

Change-Id: I36c0590ba49f45251d24dc179cb27c8368c3662a
2010-08-24 18:08:47 -07:00