Commit Graph

40235 Commits

Author SHA1 Message Date
Colin Cross 1e3df66449 Merge "Add hostdex support for soong" am: 9f588bcd15
am: a0dd1e08f2

Change-Id: I4c2eab91609f61101e0ad88ee92a3fdb83193a42
2017-10-10 22:06:46 +00:00
Colin Cross a0dd1e08f2 Merge "Add hostdex support for soong"
am: 9f588bcd15

Change-Id: I78acacc81e1d159c1f4107aa936d68adf4ce11f9
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

Change-Id: I4db990ca8469fc6e71e74bb43a79b7188b26c78c
2017-10-10 05:47:06 +00:00
Dan Willemsen 7d00b5144d Merge changes Id1d8ffb8,I20a6396d am: f398cc78fe
am: 589471eb35

Change-Id: Ia8d7593a79594f50c4b1b3c766e4f9fd8392332f
2017-10-10 05:44:25 +00:00
Dan Willemsen 589471eb35 Merge changes Id1d8ffb8,I20a6396d
am: f398cc78fe

Change-Id: I1d646eb40f1a15d6ea5b12af92b36f26526e4fe5
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
Dan Willemsen 44fd0f6b8e Reduce stack usage in ckati
When limiting ckati to 768kB of stack, it would crash with a segfault
when processing this recursive expanded variable. So always use := to
turn this into a simple variable.

I measured this using 772kB of stack in ckati on sdk_x86_64-eng. With
this change, the next highest stack user is 106kB.

Bug: 36182021
Test: ulimit -s 768; lunch sdk_x86_64-eng; m nothing
Test: build-sdk_x86_64.ninja is identical before/after this change
Change-Id: I20a6396db173decf178107e3aac6cf089e541e36
2017-10-10 03:36:21 +00:00
Colin Cross abfa40776f Add hostdex support for soong
When LOCAL_IS_HOST_MODULE is set LOCAL_BUILT_MODULE is the same
as common_javalib.jar, and dexpreopting shouldn't be enabled.

Bug: 67600882
Test: m -j checkbuild
Change-Id: I7397fa430ebc18d5cb6ba71b06e343180f09ae08
2017-10-09 17:37:49 -07:00
Alan Leung 2f9c555fd7 Merge "Revert "Enable D8 by default."" am: bc29d906bc am: 81e4d14cc7
am: 693c19ad7a

Change-Id: I843d91ceb573e64f8af060a921c6c9fcc35cdeb3
2017-10-09 21:45:40 +00:00
Alan Leung 693c19ad7a Merge "Revert "Enable D8 by default."" am: bc29d906bc
am: 81e4d14cc7

Change-Id: I2a56f958ea8083db4cb97231a1224a802c8ee382
2017-10-09 21:38:35 +00:00
Alan Leung 81e4d14cc7 Merge "Revert "Enable D8 by default.""
am: bc29d906bc

Change-Id: Ic839c5b69dca0866049ae4b4f48f41a64fa06697
2017-10-09 21:35:16 +00:00
Alan Leung bc29d906bc Merge "Revert "Enable D8 by default."" 2017-10-09 21:28:25 +00:00
Alan Leung ba985e6efe Revert "Enable D8 by default."
Breaks EmulatorSmokeTests

Bug: 67569208

This reverts commit 4c1a09823c.

Change-Id: I85b28b9b59226f4ce6fda0ea2445933eade07d89
2017-10-09 21:24:52 +00:00
Alan Leung 9bf2c705d3 Merge "Enable D8 by default." am: a867dfa71c am: d46624b4d8
am: 209e7bf321

Change-Id: Ie15ea435e30075aa572c508431ec214b6ec3f0e0
2017-10-09 20:50:42 +00:00
Alan Leung 209e7bf321 Merge "Enable D8 by default." am: a867dfa71c
am: d46624b4d8

Change-Id: I242938251d268f0122cb9b03a3be0c8fe3d60567
2017-10-09 20:26:33 +00:00
Alan Leung d46624b4d8 Merge "Enable D8 by default."
am: a867dfa71c

Change-Id: I0e68a345fb18cb52033480678eca6979bcb94f5e
2017-10-09 20:18:15 +00:00
Treehugger Robot a867dfa71c Merge "Enable D8 by default." 2017-10-09 20:07:53 +00:00
Alan Leung 4c1a09823c Enable D8 by default.
Bug: 67569208
Test: m -j32

Change-Id: Ie80ce7ca0e6955ef6c1fbae1fa5b169374068cf4
2017-10-09 07:41:35 +00:00
Mathieu Chartier e031f9e30a Merge "Add Android Go defaults make file" into oc-mr1-dev
am: a78549885e

Change-Id: I77652178df4d7e80120db3326d8e6a1ffa64299c
2017-10-07 00:22:38 +00:00
Mathieu Chartier a78549885e Merge "Add Android Go defaults make file" into oc-mr1-dev 2017-10-07 00:17:07 +00:00
Colin Cross 4442e1180f Merge changes I06b8efa8,Id2fa2d18 am: 4d44c2dc12 am: 6fff4ee8de
am: a88ca0936f

Change-Id: I0e21e38f2135bb4fbb17ae3a44d84a769e685cbf
2017-10-06 23:38:07 +00:00
Colin Cross a88ca0936f Merge changes I06b8efa8,Id2fa2d18 am: 4d44c2dc12
am: 6fff4ee8de

Change-Id: I9b520a2c63dbffb654e144668c5936c07b649013
2017-10-06 23:34:04 +00:00
Colin Cross 6fff4ee8de Merge changes I06b8efa8,Id2fa2d18
am: 4d44c2dc12

Change-Id: Ib605f3b7e1df80bb85f6894f39e6caf54aaaa514
2017-10-06 23:28:42 +00:00
Treehugger Robot 4d44c2dc12 Merge changes I06b8efa8,Id2fa2d18
* changes:
  Enable dexpreopt and dex stripping in soong jars
  Refactor removing classes.dex for dexpreopt
2017-10-06 23:14:19 +00:00
Colin Cross f229de4a4b Enable dexpreopt and dex stripping in soong jars
Dexpreopt jars from soong, which also strips classes.dex from
javalib.jar.

Test: m -j checkbuild
Test: unzip -l $OUT/system/framework/core-oj.jar
Change-Id: I06b8efa8993f6c44f0ad8c988e57a3cba08e17ad
2017-10-06 14:36:38 -07:00
Colin Cross ea1629e788 Refactor removing classes.dex for dexpreopt
Combining $(call dexpreopt-remove-classes.dex) into a
$(call copy-one-file) rule is hacky and error prone.  Make a helper
dexpreopt-copy-jar function that takes LOCAL_DEX_PREOPT and copies
the jar, removing the dex files if necessary.

Test: only description message changes to out/build-${TARGET_PRODUCT}.ninja
Change-Id: Id2fa2d18571ca01bc81302c912b8de25f3dde7a1
2017-10-06 14:26:25 -07:00
Tobias Thierer 4840d2bcb9 Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26." am: c6465f5d17 am: 719728f67d
am: 55aa54fd22

Change-Id: I7a165a3857aa32acf9930383ac39a6ced19a8174
2017-10-06 20:07:16 +00:00
Jiyong Park ac8e1428ed Merge "Don't reserve size for bad blocks when checking image size" am: dd68a6cb74 am: bc8a222efe
am: ec5aacff60  -s ours

Change-Id: I75be015b764294d28428d276201dc100482ee9e7
2017-10-06 20:05:57 +00:00
Tobias Thierer 55aa54fd22 Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26." am: c6465f5d17
am: 719728f67d

Change-Id: I3c1b93a2204d3b14c69afb4e7e051fecedd2e1ee
2017-10-06 20:03:04 +00:00
Jiyong Park ec5aacff60 Merge "Don't reserve size for bad blocks when checking image size" am: dd68a6cb74
am: bc8a222efe

Change-Id: Ia06ceb9fc418f265bff2aaf05aaf2625023e3698
2017-10-06 20:02:17 +00:00
Tobias Thierer 719728f67d Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26."
am: c6465f5d17

Change-Id: I52fec751f0dcd729f1903c4e70a6bbef8873488b
2017-10-06 19:58:34 +00:00
Jiyong Park bc8a222efe Merge "Don't reserve size for bad blocks when checking image size"
am: dd68a6cb74

Change-Id: Ibea8f1f19b6ec4a3cf1969dde726a90265439128
2017-10-06 19:55:45 +00:00
Tobias Thierer c6465f5d17 Merge "Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26." 2017-10-06 19:42:57 +00:00
Treehugger Robot dd68a6cb74 Merge "Don't reserve size for bad blocks when checking image size" 2017-10-06 19:40:29 +00:00
Tobias Thierer 745c6a55d3 Cap LOCAL_JAVA_LANGUAGE_VERSION <= 1.8 for API versions <= 26.
The default LOCAL_JAVA_LANGUAGE_VERSION is normally 1.8, or 1.9
when EXPERIMENTAL_USE_OPENJDK9 is explicitly set to the
nondefault value of "true".

Since old Android API levels do not support later versions,
LOCAL_JAVA_LANGUAGE_VERSIONs is already capped at 1.7 for
APIs <= 23.

This CL further caps it at 1.8 for all released APIs (currently
<= 26) even when EXPERIMENTAL_USE_OPENJDK9=true.
This may need to be updated in future.

This CL only affects builds where EXPERIMENTAL_USE_OPENJDK9 is
set; it does not affect the default build.

Bug: 67454477
Test: Treehugger

Change-Id: I54ca72bdb09aeb4184d5bb3c51d881dcfc943839
2017-10-06 15:57:33 +01:00
Colin Cross 6410435178 Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set" am: 0c0e2b0779 am: ed36337b02
am: 53573b6638

Change-Id: I48770f00e2c45b509f891cb3d8bf1368e62edd0b
2017-10-06 04:51:34 +00:00
Colin Cross 53573b6638 Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set" am: 0c0e2b0779
am: ed36337b02

Change-Id: Id5bbcd7ba648d4b5685cb07f7830fc3f44989e45
2017-10-06 04:46:01 +00:00
Colin Cross ed36337b02 Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set"
am: 0c0e2b0779

Change-Id: I58ebe843ce27d8de580179a4a296662f31486d31
2017-10-06 04:41:28 +00:00
Jeff Vander Stoep 222a2e511b Merge "sepolicy: add owners file" am: 750b8e84c1 am: 8bd17a1df4
am: c4e07ce19b

Change-Id: Icf67bc129db832b7d4c88bd7646597adfdc4e250
2017-10-06 04:37:54 +00:00
Treehugger Robot 0c0e2b0779 Merge "Use prebuilts/jdk/jdk9 if EXPERIMENTAL_USE_OPENJDK9 is set" 2017-10-06 04:34:52 +00:00
Jeff Vander Stoep c4e07ce19b Merge "sepolicy: add owners file" am: 750b8e84c1
am: 8bd17a1df4

Change-Id: I71ee28591bbffa6a9ed018605e7b03815788c525
2017-10-06 04:34:04 +00:00
Jeff Vander Stoep 8bd17a1df4 Merge "sepolicy: add owners file"
am: 750b8e84c1

Change-Id: I9cad69598bd74e3136fb9780e725b95d67c10823
2017-10-06 04:30:08 +00:00
Treehugger Robot 750b8e84c1 Merge "sepolicy: add owners file" 2017-10-06 04:25:27 +00:00
Jeffrey Vander Stoep 15e49fcee0 Merge "Remove world writable sysfs files" into stage-aosp-master am: 8d7af382bb
am: 1a32fd3379  -s ours

Change-Id: I2471aa9c6f78877c974374a9b8643ac111022a0d
2017-10-06 00:35:37 +00:00
Jeffrey Vander Stoep 1a32fd3379 Merge "Remove world writable sysfs files" into stage-aosp-master
am: 8d7af382bb

Change-Id: Ie1f0c85df711a106ace33700fe9cb736100ff9d7
2017-10-06 00:33:25 +00:00
Jeffrey Vander Stoep 8d7af382bb Merge "Remove world writable sysfs files" into stage-aosp-master 2017-10-06 00:20:10 +00:00
Dan Willemsen 1d4993cdee Merge "Always pass --auto-add-overlay to aapt2 for aar prebuilts" am: 4ec7972785 am: 62263d99ef
am: 8e025e030f

Change-Id: I1f83f8477f353d0c5f0a6fb2e329d50835b377a9
2017-10-06 00:14:35 +00:00