dae5371f64
Merge "Avoid feeding D8 with dex files." am: c0eabe6d34
...
am: 6bba1f1ca2
2017-12-13 02:34:15 +00:00
6bba1f1ca2
Merge "Avoid feeding D8 with dex files."
...
am: c0eabe6d34
2017-12-13 02:01:56 +00:00
c0eabe6d34
Merge "Avoid feeding D8 with dex files."
2017-12-13 01:29:40 +00:00
c95bf7aa1d
Merge "Add soong_docs to droidcore" am: f027511929
...
am: 5d8b68daca
2017-12-13 00:00:22 +00:00
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
5d8b68daca
Merge "Add soong_docs to droidcore"
...
am: f027511929
2017-12-12 23:43:25 +00:00
f027511929
Merge "Add soong_docs to droidcore"
2017-12-12 23:02:55 +00:00
2c1da1e95f
Add soong_docs to droidcore
...
Bug: 70516282
Test: treehugger
Change-Id: I818ad6f948502f4beb0205b583687c1d9fa563ac
2017-12-12 11:11:48 -08:00
7494beccb3
Merge changes I8f20db07,Id3a8dd20,I0275a5d4 am: 6553fd6cad
...
am: 90cb321f88
2017-12-12 05:02:32 +00:00
90cb321f88
Merge changes I8f20db07,Id3a8dd20,I0275a5d4
...
am: 6553fd6cad
2017-12-12 04:57:44 +00:00
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
18c29a2ffb
Merge "Enable VNDK for aosp_x86 and aosp_x86_64" am: 966e080ade
...
am: d3d7c2e180
2017-12-12 04:35:15 +00:00
d3d7c2e180
Merge "Enable VNDK for aosp_x86 and aosp_x86_64"
...
am: 966e080ade
2017-12-12 04:22:57 +00:00
966e080ade
Merge "Enable VNDK for aosp_x86 and aosp_x86_64"
2017-12-12 04:13:04 +00:00
8de45264f6
Merge "Add USE_D8_DESUGAR option in build/core" am: 78b99fefd3
...
am: c2847897ff
2017-12-12 00:15:21 +00:00
c2847897ff
Merge "Add USE_D8_DESUGAR option in build/core"
...
am: 78b99fefd3
2017-12-12 00:10:49 +00:00
78b99fefd3
Merge "Add USE_D8_DESUGAR option in build/core"
2017-12-12 00:06:18 +00:00
4a69393749
Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders." am: 9098fd8905
...
am: d78d01deec
2017-12-12 00:05:15 +00:00
d78d01deec
Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders."
...
am: 9098fd8905
2017-12-12 00:00:19 +00:00
9098fd8905
Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders."
2017-12-11 23:51:06 +00:00
5d214a3844
Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone."" am: 909a2d96f2
...
am: fe1280f4e0
2017-12-11 23:11:44 +00:00
fe1280f4e0
Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone.""
...
am: 909a2d96f2
2017-12-11 23:06:07 +00:00
909a2d96f2
Merge "Revert "Build with OpenJDK 9 -target 1.8 by default except for errorprone.""
2017-12-11 22:57:51 +00:00
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
2ac0a5d472
Merge "Create an artifact to include TEST_MAPPING files in source code" am: 9874428159
...
am: 3981526a34
2017-12-11 20:57:55 +00:00
3981526a34
Merge "Create an artifact to include TEST_MAPPING files in source code"
...
am: 9874428159
2017-12-11 20:51:53 +00:00
9874428159
Merge "Create an artifact to include TEST_MAPPING files in source code"
2017-12-11 20:42:46 +00:00
6bfcac877e
Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone." am: 3342e45722
...
am: 1c64b02a4d
2017-12-11 19:23:49 +00:00
1c64b02a4d
Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
...
am: 3342e45722
2017-12-11 19:17:41 +00:00
3342e45722
Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
2017-12-11 19:06:07 +00:00
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
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
2017-12-11 14:21:37 +00:00
a7632a0e98
Merge "Revert "Enable R8 by default"" am: 5006ee95fc
...
am: 9a6273a947
2017-12-11 10:44:06 +00:00
9a6273a947
Merge "Revert "Enable R8 by default""
...
am: 5006ee95fc
2017-12-11 10:41:02 +00:00
5006ee95fc
Merge "Revert "Enable R8 by default""
2017-12-11 10:34:02 +00:00
c2afe55679
Revert "Enable R8 by default"
...
This reverts commit 7fbc84686c
2017-12-11 10:29:07 +00:00
a942359cbb
Merge "Enable R8 by default" am: f93deb040d
...
am: adf6c87cd0
2017-12-11 07:37:10 +00:00
adf6c87cd0
Merge "Enable R8 by default"
...
am: f93deb040d
2017-12-11 07:34:04 +00:00
f93deb040d
Merge "Enable R8 by default"
2017-12-11 07:29:06 +00:00
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
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
15949b76ab
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5 am: 5a8f82d4a1 am: 7b26faa5ea am: acaa4cc623 -s ours am: 203a1f407b -s ours am: f1be8db559 -s ours
...
am: fd5769448d
2017-12-08 04:13:54 +00:00
439cb46989
resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9 am: 5cf66c7496 -s ours am: 3288f0cabb -s ours am: 7a5397dd65 -s ours
...
am: 23aff09c6f
2017-12-08 04:12:07 +00:00
fd5769448d
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5 am: 5a8f82d4a1 am: 7b26faa5ea am: acaa4cc623 -s ours am: 203a1f407b -s ours
...
am: f1be8db559
2017-12-08 04:08:09 +00:00
23aff09c6f
resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9 am: 5cf66c7496 -s ours am: 3288f0cabb -s ours
...
am: 7a5397dd65
2017-12-08 04:06:50 +00:00
f1be8db559
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5 am: 5a8f82d4a1 am: 7b26faa5ea am: acaa4cc623 -s ours
...
am: 203a1f407b
2017-12-08 04:03:53 +00:00
7a5397dd65
resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9 am: 5cf66c7496 -s ours
...
am: 3288f0cabb
2017-12-08 04:01:45 +00:00
203a1f407b
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5 am: 5a8f82d4a1 am: 7b26faa5ea
...
am: acaa4cc623
2017-12-08 03:57:47 +00:00
3288f0cabb
resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9
...
am: 5cf66c7496
2017-12-08 03:56:37 +00:00
acaa4cc623
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5 am: 5a8f82d4a1
...
am: 7b26faa5ea
2017-12-08 03:55:16 +00:00
Alan Leung