Bowgo Tsai
0e1ada16ce
Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5 am: 86c4f8ed54
...
am: 08a05cd9ae
2017-10-15 03:26:24 +00:00
Mathieu Chartier
6ab87f8fe4
Merge "Re-add missing log filter" am: 9e89b22ae7 am: dc640ca34a
...
am: 0cb9d7a4c7
2017-10-15 03:25:08 +00:00
Bowgo Tsai
08a05cd9ae
Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5
...
am: 86c4f8ed54
2017-10-15 03:08:02 +00:00
Mathieu Chartier
0cb9d7a4c7
Merge "Re-add missing log filter" am: 9e89b22ae7
...
am: dc640ca34a
2017-10-15 03:06:56 +00:00
Adam Seaton
51c969da28
Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa am: 893343fa7b
...
am: b2d1ce3cc6
2017-10-15 03:01:28 +00:00
Bowgo Tsai
86c4f8ed54
Merge "Adding Android verified boot 1.0 metadata into ENG builds"
...
am: 5f958ccad5
2017-10-15 02:48:17 +00:00
Mathieu Chartier
dc640ca34a
Merge "Re-add missing log filter"
...
am: 9e89b22ae7
2017-10-15 02:47:23 +00:00
Adam Seaton
ed0f11b63d
Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa am: 893343fa7b
...
am: bb8028e3f3
2017-10-15 02:00:11 +00:00
Adam Seaton
bb8028e3f3
Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa
...
am: 893343fa7b
2017-10-15 01:53:27 +00:00
Adam Seaton
b2d1ce3cc6
Update Security String to 2017-12-01 For December Security Bug: 67774760 am: 47ac5ac8aa
...
am: 893343fa7b
2017-10-15 01:53:27 +00:00
Adam Seaton
893343fa7b
Update Security String to 2017-12-01 For December Security Bug: 67774760
...
am: 47ac5ac8aa
2017-10-15 01:36:32 +00:00
Adam Seaton
47ac5ac8aa
Update Security String to 2017-12-01 For December Security
...
Bug: 67774760
2017-10-13 18:20:07 +00:00
Dan Willemsen
a4e6ce4fdc
Merge "Use CALLED_FROM_SETUP instead of KATI" am: bd4239a1e1 am: 8e7153bf98
...
am: 9e000cd290
2017-10-13 09:55:07 +00:00
Dan Willemsen
9e000cd290
Merge "Use CALLED_FROM_SETUP instead of KATI" am: bd4239a1e1
...
am: 8e7153bf98
2017-10-13 08:33:34 +00:00
Dan Willemsen
8e7153bf98
Merge "Use CALLED_FROM_SETUP instead of KATI"
...
am: bd4239a1e1
2017-10-13 07:32:03 +00:00
Nan Zhang
29d28e58fb
Merge "Support java compilation sharding for target side." am: 60e1f8ee27 am: 72165e0c29
...
am: bbc5a69fc5
2017-10-13 07:31:27 +00:00
Treehugger Robot
5f958ccad5
Merge "Adding Android verified boot 1.0 metadata into ENG builds"
2017-10-13 03:39:21 +00:00
Mathieu Chartier
9e89b22ae7
Merge "Re-add missing log filter"
2017-10-13 02:25:08 +00:00
Treehugger Robot
bd4239a1e1
Merge "Use CALLED_FROM_SETUP instead of KATI"
2017-10-13 01:46:11 +00:00
Nan Zhang
bbc5a69fc5
Merge "Support java compilation sharding for target side." am: 60e1f8ee27
...
am: 72165e0c29
2017-10-13 00:54:42 +00:00
Nan Zhang
72165e0c29
Merge "Support java compilation sharding for target side."
...
am: 60e1f8ee27
2017-10-13 00:51:11 +00:00
Treehugger Robot
60e1f8ee27
Merge "Support java compilation sharding for target side."
2017-10-13 00:40:37 +00:00
Mathieu Chartier
f3d91ae50b
Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" am: dcb1f24e9b am: 6c1aa4584a
...
am: 947d60cc7d
2017-10-12 23:04:44 +00:00
Mathieu Chartier
947d60cc7d
Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" am: dcb1f24e9b
...
am: 6c1aa4584a
2017-10-12 22:42:06 +00:00
Mathieu Chartier
6c1aa4584a
Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY"
...
am: dcb1f24e9b
2017-10-12 22:37:24 +00:00
Dan Willemsen
20f99a60ea
Use CALLED_FROM_SETUP instead of KATI
...
So that we can use kati instead of make for the initial config loading.
Test: m clean; m nothing
Test: USE_GOMA=true m nothing
Test: m PRODUCT-aosp_x86-sdk
Test: m APP-Calculator
Test: multiproduct_kati -only-config (on AOSP and internal master)
Change-Id: I5d3af847607fa48868c2045401977eca37dc6ae1
2017-10-12 15:35:42 -07:00
Mathieu Chartier
dcb1f24e9b
Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY"
2017-10-12 22:32:43 +00:00
Mathieu Chartier
f834eccd52
Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
...
Renamed WITH_DEXPREOPT_BOOT_IMG_ONLY to
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY and changed the
behavior accordingly.
Preopt system server jars since selinux prevents system server from
loading anything from /data. If we don't do this they will need to
be extracted which is not favorable for RAM usage or performance.
Test: make and flash and look at system server maps
Bug: 65122284
Bug: 62356545
(cherry picked from commit 418258cee9
2017-10-12 20:40:41 +00:00
Nan Zhang
ad818dcbea
Support java compilation sharding for target side.
...
Add "LOCAL_JAVAC_SHARD_SIZE" to represent the number of java
source path entries in each shard.
Sharding is not allowed when "LOCAL_JAVAC_SHARD_SIZE" and
"LOCAL_JAR_PROCESSORS" are both enabled.
Limitation:
1. 0 <= LOCAL_JAVAC_SHARD_SIZE <= 8192
1. 0 < NUM(java_sources) <= 8192
2. 0 <= NUM(shards) <= 100
Performance Compare:
<Unsharded Build------------------------------------------------>
1. Build from clean state
rm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/
&& time m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar
real 1m2.720s user 5m26.604s sys 0m39.552s
2. Incremental build
m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar &&
touch frameworks/base/core/java/android/net/http/HttpResponseCache.java && time m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar
real 0m37.586s user 5m47.804s sys 0m50.388s
<Sharded Build-------------------------------------------------->
1. Build from clean state
rm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/
&& time m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar
Javac Shard Size: 50----real 1m10.163s user 25m59.008s sys 1m58.460s
Javac Shard Size: 100---real 1m2.115s user 21m3.600s sys 1m15.964s
Javac Shard Size: 150---real 0m59.520s user 18m10.544s sys 1m12.628s
Javac Shard Size: 200---real 0m56.894s user 15m39.244s sys 1m11.608s
Javac Shard Size: 250---real 0m55.991s user 14m38.716s sys 1m2.292s
Javac Shard Size: 300---real 0m55.114s user 13m6.568s sys 1m8.200s
Javac Shard Size: 350---real 0m53.144s user 12m7.740s sys 1m3.836s
Javac Shard Size: 400---real 0m54.929s user 12m9.324s sys 1m4.340s
Javac Shard Size: 450---real 1m30.194s user 25m31.468s sys 1m52.416s
Javac Shard Size: 500---real 0m53.976s user 10m35.500s sys 0m55.160s
2. Incremental build
m out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar &&
touch frameworks/base/core/java/android/net/http/HttpResponseCache.java && time m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar
Javac Shard Size: 50-----real 0m16.322s user 1m8.648s sys 0m31.700s
Javac Shard Size: 100----real 0m16.163s user 1m22.932s sys 0m29.440s
Javac Shard Size: 150----real 0m16.611s user 1m37.828s sys 0m21.168s
Javac Shard Size: 200----real 0m16.936s user 1m49.248s sys 0m28.636s
Javac Shard Size: 250----real 0m17.509s user 1m54.944s sys 0m32.768s
Javac Shard Size: 300----real 0m18.868s user 1m54.088s sys 0m28.824s
Javac Shard Size: 350----real 0m17.629s user 1m54.108s sys 0m31.056s
Javac Shard Size: 400----real 0m18.658s user 2m7.712s sys 0m30.636s
Javac Shard Size: 450----real 0m18.874s user 2m8.808s sys 0m33.540s
Javac Shard Size: 500----real 0m19.432s user 2m24.400s sys 0m30.368s
time m nothing:
real 0m5.799s user 0m7.236s sys 0m3.068s
Test: m clean && m -j checkbuild
Bug: b/67424047
Change-Id: Id0766d2b7de7c4546d29bbc7f8a0dd0e4b9ad45b
2017-10-12 13:23:06 -07:00
Bowgo Tsai
6ceeb1a8bf
Adding Android verified boot 1.0 metadata into ENG builds
...
Adding verified boot metadata with a "disable magic". The resulting
metadata at the end of each image (e.g., system.img, vendor.img) will
be the same as triggering an "adb disable-verity" on an USERDEBUG image.
This can help simplify the code on fs_mgr, which won't have to check if
current image is an ENG build or not.
Bug: 63056044
Test: boot sailfish eng/userdebug builds
Change-Id: I95d23ac7b76c04d6d4483c9c4dc1de16bf0d9c3a
2017-10-12 10:08:44 +08:00
Mathieu Chartier
a996337658
Re-add missing log filter
...
Was accidentally deleted in a61acf62c9
2017-10-11 17:10:25 -07:00
Courtney Goeltzenleuchter
cb93076f72
Merge "Move include in prep of Android.bp support" am: 367da66255 -s ours am: a9088231c1 -s ours
...
am: d52fdef969
2017-10-11 14:36:26 +00:00
Courtney Goeltzenleuchter
d52fdef969
Merge "Move include in prep of Android.bp support" am: 367da66255 -s ours
...
am: a9088231c1
2017-10-11 14:29:07 +00:00
Courtney Goeltzenleuchter
a9088231c1
Merge "Move include in prep of Android.bp support"
...
am: 367da66255
2017-10-11 14:24:47 +00:00
Courtney Goeltzenleuchter
367da66255
Merge "Move include in prep of Android.bp support"
2017-10-11 14:14:05 +00:00
Courtney Goeltzenleuchter
d0047d922e
Move include in prep of Android.bp support
...
Test: make
Merged-In: I1d1a240b2557db3d9d0a0b2227f84eff09f8d4ca
Change-Id: I1d1a240b2557db3d9d0a0b2227f84eff09f8d4ca
(cherry picked from commit dd35495a77
2017-10-11 03:29:53 +00:00
Jiyong Park
2416dc8cd1
Merge "Prevent vendor libs from depending on private VNDK libraries" am: 492f67c0ac am: 327a511925
...
am: b1d7b3a44f
2017-10-11 02:00:49 +00:00
Jiyong Park
b1d7b3a44f
Merge "Prevent vendor libs from depending on private VNDK libraries" am: 492f67c0ac
...
am: 327a511925
2017-10-11 01:56:14 +00:00
Jiyong Park
327a511925
Merge "Prevent vendor libs from depending on private VNDK libraries"
...
am: 492f67c0ac
2017-10-11 01:51:24 +00:00
Treehugger Robot
492f67c0ac
Merge "Prevent vendor libs from depending on private VNDK libraries"
2017-10-11 01:45:36 +00:00
Colin Cross
b4f6f611c5
Merge "Add hostdex support for soong" am: 9f588bcd15 am: a0dd1e08f2
...
am: 1e3df66449
2017-10-10 22:11:13 +00:00
Colin Cross
1e3df66449
Merge "Add hostdex support for soong" am: 9f588bcd15
...
am: a0dd1e08f2
2017-10-10 22:06:46 +00:00
Colin Cross
a0dd1e08f2
Merge "Add hostdex support for soong"
...
am: 9f588bcd15
2017-10-10 22:03:28 +00:00
Colin Cross
9f588bcd15
Merge "Add hostdex support for soong"
2017-10-10 21:52:17 +00:00
Jiyong Park
a3fb1588f4
Prevent vendor libs from depending on private VNDK libraries
...
For module installed to /vendor partition, direct linking to the libs
marked as `vendor_available: false` is not allowed. The
Bug: 64730695
Test: Add vendor_available: false to libft2 and
libcompiler_rt. Add the two libs into LOCAL_SHARED_LIBRARIES of a vendor
lib (e.g. libdrm). Build fails with the link_type check error message.
Change-Id: Iaf23574ceddb0c087111e1d95997e9ddd60cdf87
2017-10-10 19:38:06 +09:00
Dan Willemsen
78bb63da91
Merge changes Id1d8ffb8,I20a6396d am: f398cc78fe am: 589471eb35
...
am: 7d00b5144d
2017-10-10 05:47:06 +00:00
Dan Willemsen
7d00b5144d
Merge changes Id1d8ffb8,I20a6396d am: f398cc78fe
...
am: 589471eb35
2017-10-10 05:44:25 +00:00
Dan Willemsen
589471eb35
Merge changes Id1d8ffb8,I20a6396d
...
am: f398cc78fe
2017-10-10 05:41:57 +00:00
Treehugger Robot
f398cc78fe
Merge changes Id1d8ffb8,I20a6396d
...
* changes:
Fix broken foreach loop
Reduce stack usage in ckati
2017-10-10 05:35:28 +00:00
Dan Willemsen
2d081b35d4
Fix broken foreach loop
...
This wasn't initializing the STATS.MODULE_TYPE.* variables, leading to
106kB of stack usage in ckati for sdk_x86_64-eng. With this fixed, the
next highest stack usage is 35kB.
Bug: 36182021
Test: Run $(flavor) over all the variables
Test: Check stack usage with custom ckati patches
Test: build-sdk_x86_64.ninja is identical before/after this change
Change-Id: Id1d8ffb8415ad6613d0093d31be5472d42d300fd
2017-10-10 03:36:42 +00:00
