Commit graph

19091 commits

Author SHA1 Message Date
Colin Cross
dd2ff5541e build: fix host dex2oat runtime args
The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES,
not PRODUCT_PROPERTY_OVERRIDES.
Use $(call func,args) for user defined functions
Prepend the property contents with -Xms or -Xmx when passing to
dex2oat.  This only worked before because DEX2OAT_XMS, etc. were blank
due to the first two  bugs, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.

Change-Id: Ifa30038b397355171fefcc5248eea033bb634036
2014-07-09 22:22:10 -07:00
Brian Carlstrom
ef0b6e0c19 am 8a749606: am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
  Make dex2oat heap size product configurable [build]
2014-07-09 12:36:31 +00:00
Ying Wang
d3b5d574de am ce40d5f9: am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
  More consistent use of 64-bit build variable.
2014-07-09 12:36:30 +00:00
Deepanshu Gupta
4fc3a60ab6 am 75cdce7b: (-s ours) am 98da9070: am 307a8ec9: am 8eaddc6c: am 071a2f83: (-s ours) am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '75cdce7bd6f821eb4103f496fcd3cfbf82c66269':
  Integrate build_font.py [DO NOT MERGE]
2014-07-09 12:23:47 +00:00
smain@google.com
49a723a514 am afb83c6b: (-s ours) am 62cf72b0: am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit 'afb83c6b3ca9935f7ad89a549105b27fb40f5fdb':
  DO NOT MERGE revise butter bar message for clarity
2014-07-09 12:23:46 +00:00
Brian Carlstrom
8a7496060d am 02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
  Make dex2oat heap size product configurable [build]
2014-07-09 12:21:56 +00:00
Ying Wang
ce40d5f99e am bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit 'bc7501e10324caf1318769901d8a382d46be0b60':
  More consistent use of 64-bit build variable.
2014-07-09 12:21:48 +00:00
Ying Wang
3abc2a3926 Copy over aidl info for modules not loaded by the current build
That way we don't lose the record if user is running mm/mmm.

Change-Id: I1e1a8b99b4f659b73f73d89f409a24aa36464066
2014-07-08 22:11:06 -07:00
Elliott Hughes
45a45d611f am a97f675c: am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit 'a97f675c921efdbc34f33f12c9a523fc898e624f':
  ADBS now uses stack_core code to parse traces.
2014-07-09 01:28:20 +00:00
Deepanshu Gupta
042c8a06c1 am f0200e87: am 72146221: am 0b3aa00e: am da111964: (-s ours) am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit 'f0200e87547272a33e147f435fbae384ea82b359':
  Integrate build_font.py [DO NOT MERGE]
2014-07-09 00:01:57 +00:00
Deepanshu Gupta
f0200e8754 am 72146221: am 0b3aa00e: am da111964: (-s ours) am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '721462210a5713e9bc59ed292a8bbea9c433a1c1':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:58:18 +00:00
Deepanshu Gupta
721462210a am 0b3aa00e: am da111964: (-s ours) am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '0b3aa00eaf7a836770681f69c096e915cd686dd9':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:54:07 +00:00
Deepanshu Gupta
0b3aa00eaf am da111964: (-s ours) am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit 'da1119642d5a3eb4fd34459ef88d6e1cfbecd1da':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:48:54 +00:00
Deepanshu Gupta
da1119642d am d23dcdf1: am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit 'd23dcdf135541f2c4d7e61b1f02a04fe6b0bac48':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:44:34 +00:00
Deepanshu Gupta
d23dcdf135 am a0130a4d: am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit 'a0130a4d6fea1b0b256c5a5ad11886f9291a4c0a':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:40:06 +00:00
Deepanshu Gupta
75cdce7bd6 am 98da9070: am 307a8ec9: am 8eaddc6c: am 071a2f83: (-s ours) am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '98da90707f1c5fdec61b75196d593b56ec6f4c79':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:38:28 +00:00
smain@google.com
afb83c6b3c am 62cf72b0: am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '62cf72b03fe2888b2dd80442ad4ec9851ddc431c':
  DO NOT MERGE revise butter bar message for clarity
2014-07-08 23:38:27 +00:00
Deepanshu Gupta
a0130a4d6f am 9915a60c: (-s ours) am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '9915a60c5d1a003f45455930e2a55033d6e15f3f':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:35:01 +00:00
Deepanshu Gupta
98da90707f am 307a8ec9: am 8eaddc6c: am 071a2f83: (-s ours) am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '307a8ec96132dc3d6859a5e1cf338b0dc9c25273':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:34:10 +00:00
smain@google.com
62cf72b03f am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '60d43ddecf8f582348685f4bfc5cd980dca9a1ba':
  DO NOT MERGE revise butter bar message for clarity
2014-07-08 23:34:10 +00:00
Deepanshu Gupta
307a8ec961 am 8eaddc6c: am 071a2f83: (-s ours) am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '8eaddc6cac7f10e434dcdd4efc119e363353e8a8':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:28:45 +00:00
Deepanshu Gupta
9915a60c5d am 1bb64302: am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '1bb64302ad23e9edea50b09c673f59f681e4f47a':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:26:18 +00:00
Deepanshu Gupta
8eaddc6cac am 071a2f83: (-s ours) am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '071a2f8363e32fd99da8c03e03dc8f7a9a5378c2':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:24:17 +00:00
Deepanshu Gupta
1bb64302ad am 1699a434: am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '1699a434a669a70e8696c5e110cacaf0725a68c0':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:21:36 +00:00
Deepanshu Gupta
071a2f8363 am ea2f4e3c: am daee7822: Integrate build_font.py [DO NOT MERGE]
* commit 'ea2f4e3cbbf21531d00ba966ca5863bb575c0cf4':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:19:48 +00:00
Deepanshu Gupta
1699a434a6 am 075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '075f7751faaa37394c8f24d0ed840edd0640a9e3':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:17:25 +00:00
Deepanshu Gupta
ea2f4e3cbb am daee7822: Integrate build_font.py [DO NOT MERGE]
* commit 'daee78227c9156704cce134f62f3e88416728652':
  Integrate build_font.py [DO NOT MERGE]
2014-07-08 23:15:47 +00:00
Brian Carlstrom
02a5b51798 Merge "Make dex2oat heap size product configurable [build]" 2014-07-08 22:56:31 +00:00
Ying Wang
bc7501e103 Merge "More consistent use of 64-bit build variable." 2014-07-08 22:56:31 +00:00
Ying Wang
4b1c95d8d2 More consistent use of 64-bit build variable.
Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.

Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
2014-07-08 18:04:17 -07:00
Elliott Hughes
a97f675c92 am 1b1840cb: am af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '1b1840cbef77f2abfe95af56bc927c647a693429':
  ADBS now uses stack_core code to parse traces.
2014-07-08 20:15:39 +00:00
Elliott Hughes
1b1840cbef am af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit 'af95db033de4808826fde12772a6d33a72dda608':
  ADBS now uses stack_core code to parse traces.
2014-07-08 20:12:20 +00:00
Dan Albert
8f73aeea87 am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '183f90f40ce9e0fafa563dfaf1fb4450cb98168c':
  Remove -Bsymbolic from builds.
2014-07-08 18:55:55 +00:00
Dan Albert
183f90f40c am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '3ffcf184bcb61bad78f3e503ca1760e64e4d30bb':
  Remove -Bsymbolic from builds.
2014-07-08 18:51:44 +00:00
Brian Carlstrom
cffe289dc6 Make dex2oat heap size product configurable [build]
Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
2014-07-08 11:33:45 -07:00
Dan Albert
3ffcf184bc Merge "Remove -Bsymbolic from builds." 2014-07-08 18:09:01 +00:00
Joe LaPenna
6b37fd7483 Merge "CW on Master: Add wifi-service to core_tiny" 2014-07-08 17:33:57 +00:00
Dan Albert
9d8d20a1e1 am 8f73aeea: am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '8f73aeea87f96d715ca2f39a35fd73986feecceb':
  Remove -Bsymbolic from builds.
2014-07-08 18:59:48 +00:00
Joe LaPenna
bde7cc108c CW on Master: Add wifi-service to core_tiny
BUG: 15143878

Change-Id: Idd31188456fa5cf9622f2ff754157286b3de97d1
2014-07-08 11:38:10 -07:00
Ying Wang
55ec7e63d0 am 9e00b638: am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '9e00b6385c5805743f5beaa22dffce021342ed5e':
  Fix host java doc by referring to the correct classpath.
2014-07-08 01:38:44 +00:00
Ying Wang
9e00b6385c am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit 'cd02c025ad6b0647d612c4b939df8e5de55f5192':
  Fix host java doc by referring to the correct classpath.
2014-07-08 00:48:55 +00:00
Ying Wang
cd02c025ad am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '979d578ee40c0a7d3e25915049350a23165f7a5a':
  Fix host java doc by referring to the correct classpath.
2014-07-08 00:43:42 +00:00
Ying Wang
f951b7743f am 1c00c702: am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '1c00c7026c23967ca33524356dc11d9885f960f9':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:31:00 +00:00
Ying Wang
1c00c7026c am 45322890: am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '45322890266c1d704b130fabd7ee5bab5db35997':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:26:10 +00:00
Ying Wang
4532289026 am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit 'd2aa51b8aee454baf96d8ac6d1997dd9450ae974':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:22:13 +00:00
Ying Wang
1a5ada11d5 Auto-clean obsolete aidl-generated Java files.
The build system compares aidl files of every module to the previous
build and deletes the intermediate generated source dir if an aidl file
has gone.

Change-Id: I55fcfe1baaae3496613e12c20bca564d408bba58
2014-07-07 16:58:39 -07:00
Raph Levien
093d04c631 Add Zopfli-recompress option to zipalign
Zopfli provides compression roughly 5% better than zlib, while remaining
completely compatible with zlib decoders. This patch adds a "-z" option
to zipalign, recompressing all compressed files within the zip archive.

Change-Id: If177ca4b82ec701b7446861b2cfe08c6bd403813
2014-07-07 16:03:49 -07:00
Elliott Hughes
af95db033d Merge "ADBS now uses stack_core code to parse traces." 2014-07-07 18:07:41 +00:00
Brigid Smith
90c66cff3a ADBS now uses stack_core code to parse traces.
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
2014-07-07 15:14:41 -07:00
Ying Wang
5769e2a0c0 am e68ec719: (-s ours) [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.
* commit 'e68ec719039406bfcc6cd8b1cab4890afbeb66a8':
  [DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.
2014-07-07 18:00:39 +00:00