Commit Graph

40886 Commits

Author SHA1 Message Date
Søren Gjesse a2e6d78ce6 Merge "Revert "Enable R8 by default (second attempt)""
am: adcd4c761d

Change-Id: Ifa538a0985548e5188601045131022ecfe50bcf8
2017-12-15 15:33:08 +00:00
Søren Gjesse adcd4c761d Merge "Revert "Enable R8 by default (second attempt)"" 2017-12-15 15:27:16 +00:00
Søren Gjesse cd13676221 Revert "Enable R8 by default (second attempt)"
This reverts commit f2a697725c.

Reason for revert: b/70710434

Change-Id: Ia6d42e4c2fc7e7a4ca67d42d7aaa57ab95c2cc9a
2017-12-15 15:18:57 +00:00
Søren Gjesse f692713515 Merge "Enable R8 by default (second attempt)"
am: 837408b4ca

Change-Id: I1fb287f61cedbf1875c57b1d821b1179141bf950
2017-12-15 11:10:26 +00:00
Søren Gjesse 837408b4ca Merge "Enable R8 by default (second attempt)" 2017-12-15 11:05:25 +00:00
Dan Albert 1316e40597 Merge "Default NDK modules to libc++_shared."
am: 587ced4a80

Change-Id: I704594e8b8980747d30b7d45b3189d37ec729422
2017-12-15 02:36:34 +00:00
Treehugger Robot 587ced4a80 Merge "Default NDK modules to libc++_shared." 2017-12-15 02:29:58 +00:00
Dan Albert 6168f5baf1 Default NDK modules to libc++_shared.
Test: make native
Bug: None
Change-Id: I9ca2313c2082e9841a20e240ffca84219a419d49
2017-12-14 14:45:33 -08:00
Colin Cross f202d3f0c2 Merge "Add Soong modules to apkcerts"
am: c212517c9b

Change-Id: Ifb3ae2be0a6f801d56ccb9ff971cabf9cb4e4dd9
2017-12-14 22:26:40 +00:00
Tao Bao 8baa6d4dcd Merge "releasetools: Remove '-w' from ota_from_target_files options."
am: 78b5724622

Change-Id: I32782d498643a8e15141f28443268a7191c60a59
2017-12-14 22:24:45 +00:00
Colin Cross c212517c9b Merge "Add Soong modules to apkcerts" 2017-12-14 22:20:08 +00:00
Treehugger Robot 78b5724622 Merge "releasetools: Remove '-w' from ota_from_target_files options." 2017-12-14 22:18:56 +00:00
Søren Gjesse f2a697725c Enable R8 by default (second attempt)
Test: m -j PRODUCT-aosp_x86-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: I06903dc30c802bbcffd6992c3c25a1b711a5875c
2017-12-14 22:24:48 +01:00
Colin Cross aec3640560 Add Soong modules to apkcerts
Bug: 70669383
Test: m apkcerts-list contains framework-res
Change-Id: I00c5c5d9e7311bbe4f16bf48407dd0efa242c7aa
2017-12-14 12:29:30 -08:00
Colin Cross e6dc6b2026 Merge "Replace build/tools with build/make/tools"
am: 973301af79

Change-Id: I3303c4c8883b76bb2b687e07a8c1834811caf5a4
2017-12-13 02:42:37 +00:00
Treehugger Robot 973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
Justin Yun db00ea991d Merge "Define PLATFORM_VNDK_VERSION"
am: 553de17d44

Change-Id: Ieeb576473577a712d94bfd4fe8af98251003be4c
2017-12-13 02:03:09 +00:00
Alan Leung 6bba1f1ca2 Merge "Avoid feeding D8 with dex files."
am: c0eabe6d34

Change-Id: I4c22efe2b6766341fef64be151ef6f4a944a2cb8
2017-12-13 02:01:56 +00:00
Treehugger Robot 553de17d44 Merge "Define PLATFORM_VNDK_VERSION" 2017-12-13 01:49:41 +00:00
Justin Yun 2a233b3b86 Define PLATFORM_VNDK_VERSION
PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".

Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
2017-12-13 10:48:34 +09:00
Treehugger Robot c0eabe6d34 Merge "Avoid feeding D8 with dex files." 2017-12-13 01:29:40 +00:00
Alan Leung aff156bd49 Avoid feeding D8 with dex files.
Some test targets include dex files as resource to be loaded
at runtime. This is an issue since full D8 also take dex files
as input.

This CL extracts only the class files and feed that to D8 instead
of the whole jar.

Test: USE_D8_DESUGAR=true m checkbuild tests
Bug: 69329508

Change-Id: I52d80ec01933573f18eb497472a80b6a649c9dae
2017-12-12 15:51:25 -08:00
Colin Cross 5d8b68daca Merge "Add soong_docs to droidcore"
am: f027511929

Change-Id: I353b59cfbd7bf86eac0b999f86cb32f9193e3a68
2017-12-12 23:43:25 +00:00
Colin Cross f027511929 Merge "Add soong_docs to droidcore" 2017-12-12 23:02:55 +00:00
Colin Cross 2c1da1e95f Add soong_docs to droidcore
Bug: 70516282
Test: treehugger
Change-Id: I818ad6f948502f4beb0205b583687c1d9fa563ac
2017-12-12 11:11:48 -08:00
SzuWei Lin 90cb321f88 Merge changes I8f20db07,Id3a8dd20,I0275a5d4
am: 6553fd6cad

Change-Id: I1e54f781f0ea3929200ecb3505ec71cb0ad30b99
2017-12-12 04:57:44 +00:00
Treehugger Robot 6553fd6cad Merge changes I8f20db07,Id3a8dd20,I0275a5d4
* changes:
  Enable VNDK runtime checking
  Add vintf into GSI
  Add a default apn-conf.xml into GSI
2017-12-12 04:50:26 +00:00
Isaac Chen d3d7c2e180 Merge "Enable VNDK for aosp_x86 and aosp_x86_64"
am: 966e080ade

Change-Id: Id8164d72b1aedd6521645df09e7ba9bb541f1c48
2017-12-12 04:22:57 +00:00
Isaac Chen 966e080ade Merge "Enable VNDK for aosp_x86 and aosp_x86_64" 2017-12-12 04:13:04 +00:00
Alan Leung c2847897ff Merge "Add USE_D8_DESUGAR option in build/core"
am: 78b99fefd3

Change-Id: I9a81702a827231b731e0c7b3938092c43b3a01d5
2017-12-12 00:10:49 +00:00
Treehugger Robot 78b99fefd3 Merge "Add USE_D8_DESUGAR option in build/core" 2017-12-12 00:06:18 +00:00
Simran Basi d78d01deec Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders."
am: 9098fd8905

Change-Id: Ie50dab529ba5cc4c8ad86eec8fca5a0358b2846c
2017-12-12 00:00:19 +00:00
Treehugger Robot 9098fd8905 Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders." 2017-12-11 23:51:06 +00:00
Tobias Thierer fe1280f4e0 Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone.""
am: 909a2d96f2

Change-Id: Ie957ad6645320da76c0a6e637dd66aa423f21827
2017-12-11 23:06:07 +00:00
Tobias Thierer 909a2d96f2 Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" 2017-12-11 22:57:51 +00:00
Alan Leung eaafb3cd37 Add USE_D8_DESUGAR option in build/core
Add an option to use D8's desugar instead of the standalone version.

USE_D8_DESUGAR=true m would trigger DCHECK in dex2oat unless
https://android-review.googlesource.com/c/platform/art/+/562595 is
patched in as well.

Bug: 69329508
Test: m && USE_D8_DESUGAR=false m

Change-Id: I601dada44c361e45bbc0e2227ae1544a7d9efa90
2017-12-11 14:03:09 -08:00
Dan Shi 3981526a34 Merge "Create an artifact to include TEST_MAPPING files in source code"
am: 9874428159

Change-Id: I67f2132460e7134f7df35c06dc80bf743b531a11
2017-12-11 20:51:53 +00:00
Treehugger Robot 9874428159 Merge "Create an artifact to include TEST_MAPPING files in source code" 2017-12-11 20:42:46 +00:00
Tobias Thierer 1c64b02a4d Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
am: 3342e45722

Change-Id: Iedf41adf5cf04614a1bcb27eea5e2e3cb61c96b9
2017-12-11 19:17:41 +00:00
Tobias Thierer 3342e45722 Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." 2017-12-11 19:06:07 +00:00
Tobias Thierer bfa043039d Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
After this revert CL topic, the default toolchain for Android
goes back to being OpenJDK 8.

This revert is being prepared ahead of time in case of
any problems with CL topic:
https://r.android.com/#/q/topic:bug69449021_attempt2

Bug: 69449021
Test: Treehugger

Change-Id: I0ef41eff91e0d8437dc95e8569880f26f2529bc9
2017-12-11 14:21:37 +00:00
Tobias Thierer ab1e54d5f1 Build with OpenJDK 9 -target 1.8 by default except for errorprone.
(This is cherry-picked from the first attempt to submit this CL
topic, which was reverted after 3 hours because of bug 70286093;
robolectric 3.{1.1,4.2} now stick with OpenJDK 8 to avoid that bug).

Before this CL topic, the build toolchain for .java source files
used OpenJDK 8, targeting 1.8 (v52 class files) by default.

This CL topic switches the default to OpenJDK 9, but still
targeting 1.8 (v52 class files) by default. If USE_ERROR_PRONE
is set to true, then the default remains OpenJDK 8.

Code in the Android platform should generally be unaffected,
but if host tools that are now compiled and run using
OpenJDK 9 are causing problems for your team, then let me
know.

To manually switch back to the old behavior for now (continue
using OpenJDK 8), run this command in your shell:
export EXPERIMENTAL_USE_OPENJDK9=false

Bug: 69449021
Test: Treehugger
Test: Running robolectric tests succeeds on internal-master
      after cherry-picking this CL topic, using the command
      line from http://b/70286093#comment1

(cherry picked from commit 5f36a62622)

Change-Id: I4972c714ed80c35328895e88675b56bf0e195c01
2017-12-11 14:21:37 +00:00
Søren Gjesse 9a6273a947 Merge "Revert "Enable R8 by default""
am: 5006ee95fc

Change-Id: Id1daece62d540973fb2ba5b127eb8e781d4e9c07
2017-12-11 10:41:02 +00:00
Søren Gjesse 5006ee95fc Merge "Revert "Enable R8 by default"" 2017-12-11 10:34:02 +00:00
Søren Gjesse c2afe55679 Revert "Enable R8 by default"
This reverts commit 7fbc84686c.

Reason for revert: Build failures on oc-mr1-dev-plus-aosp, b/70486468.

Change-Id: I8c1bf38355b1e35748e065d39038c2aaf37c64af
Exempt-From-Owner-Approval: Revert due to build failures
2017-12-11 10:29:07 +00:00
Søren Gjesse adf6c87cd0 Merge "Enable R8 by default"
am: f93deb040d

Change-Id: I908f2b27a311a038f9574ea58b75fcfd0b9c8736
2017-12-11 07:34:04 +00:00
Søren Gjesse f93deb040d Merge "Enable R8 by default" 2017-12-11 07:29:06 +00:00
SzuWei Lin 596c026fd6 Enable VNDK runtime checking
GSI enabled "BOARD_VNDK_VERSION := current" on O-MR1,
but disabled VNDK runtime checking. This patch enables the checking

Bug: 69393797
Test: Build pass and boot to home screen on a Pixel device with GSI
Change-Id: I8f20db0798a07e63c453a9fe64638b99b41cd166
Merged-In: I8f20db0798a07e63c453a9fe64638b99b41cd166
(cherry picked from commit 7323f1d4ec)
2017-12-11 02:05:50 +00:00
Søren Gjesse 7fbc84686c Enable R8 by default
Test: m -j PRODUCT-aosp_x86-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: I3c07cfce7db44fcc2e1bf99960da248558d4a686
2017-12-08 14:00:21 +01:00
SzuWei Lin 5cde531adb Add vintf into GSI
Bug: 70248004
Test: build pass and check the file in system image
Change-Id: Id3a8dd20e3de5dbba9d6ec222b32fed8817d300b
2017-12-08 11:07:35 +08:00