Tobias Thierer
3342e45722
Merge "Build with OpenJDK 9 -target 1.8 by default except for errorprone."
2017-12-11 19:06:07 +00:00
Elisa Pascual Trevino
ff188feeb1
[DO NOT MERGE] Update security string to 2018-02-05
...
Bug 70487538
2017-12-11 18:36:56 +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
2017-12-11 14:21:37 +00:00
Søren Gjesse
463c9e7bc6
Merge "Revert "Enable R8 by default"" am: 5006ee95fc am: 9a6273a947
...
am: a7632a0e98
2017-12-11 10:47:43 +00:00
Søren Gjesse
a7632a0e98
Merge "Revert "Enable R8 by default"" am: 5006ee95fc
...
am: 9a6273a947
2017-12-11 10:44:06 +00:00
Søren Gjesse
9a6273a947
Merge "Revert "Enable R8 by default""
...
am: 5006ee95fc
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
2017-12-11 10:29:07 +00:00
Søren Gjesse
533789f032
Merge "Enable R8 by default" am: f93deb040d am: adf6c87cd0
...
am: a942359cbb
2017-12-11 07:43:13 +00:00
Søren Gjesse
a942359cbb
Merge "Enable R8 by default" am: f93deb040d
...
am: adf6c87cd0
2017-12-11 07:37:10 +00:00
Søren Gjesse
adf6c87cd0
Merge "Enable R8 by default"
...
am: f93deb040d
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
Simran Basi
e0c7f76823
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 -s ours
...
am: 15949b76ab
2017-12-08 17:07:06 +00:00
Ryan Longair
0025fee6a0
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 -s ours
...
am: 439cb46989
2017-12-08 17:05:35 +00:00
Jaegeuk Kim
6149ea8637
Merge "core, release: add sload.f2fs for otatools.zip" am: 10c9f5d9d3 am: a5a2f10d79
...
am: cc1d0c982e
2017-12-08 17:00:37 +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
Simran Basi
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
Ryan Longair
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
Simran Basi
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
Ryan Longair
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
Simran Basi
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
Ryan Longair
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
Simran Basi
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
Ryan Longair
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
Simran Basi
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
Ryan Longair
5cf66c7496
resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d
...
am: 73d1c9c6d9
2017-12-08 03:51:35 +00:00
Simran Basi
7b26faa5ea
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5
...
am: 5a8f82d4a1
2017-12-08 03:50:33 +00:00
Ryan Longair
73d1c9c6d9
resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032
...
am: e53bed3f7d
2017-12-08 03:47:33 +00:00
Simran Basi
5a8f82d4a1
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112
...
am: a749d6bdb5
2017-12-08 03:47:33 +00:00
Ryan Longair
e53bed3f7d
resolve merge conflicts of e4f7788661 to nyc-dr1-dev
...
am: 78f5ddb032
2017-12-08 03:43:31 +00:00
Simran Basi
a749d6bdb5
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories.
...
am: 0dd1fb9112
2017-12-08 03:43:26 +00: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
SzuWei Lin
f786f03656
Add a default apn-conf.xml into GSI
...
Add a default apn-conf.xml for telephony data network, then some
devices, ex. emulator, could use the default setting when it's
system image overrided by GSI.
Bug: 69869274
Test: build pass and boot a Pixel device with GSI to home screen
Change-Id: I0275a5d420eadcbb2f744e995c9a72a1fb46b935
2017-12-08 10:54:43 +08:00
Ryan Longair
78f5ddb032
resolve merge conflicts of e4f7788661 to nyc-dr1-dev
...
Bug: 67456333
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5f9a7692649312d79e9aa3d6b6f614a3aaa77a99
Merged-In: I77529021e852af35571fb99537d87100010b47af
2017-12-08 02:20:13 +00:00
Jaegeuk Kim
cc1d0c982e
Merge "core, release: add sload.f2fs for otatools.zip" am: 10c9f5d9d3
...
am: a5a2f10d79
2017-12-08 01:13:43 +00:00
Jaegeuk Kim
a5a2f10d79
Merge "core, release: add sload.f2fs for otatools.zip"
...
am: 10c9f5d9d3
2017-12-08 01:07:30 +00:00
Dan Shi
a20b6aa331
Merge "Create artifacts to include the list of test configs" am: c6b28799e9 am: 00d3e58d1c
...
am: aa9f05a409
2017-12-08 01:04:46 +00:00
Elliott Hughes
7fe213507e
Merge "Get off my lawn forever!" am: 68a6b90f6b am: de2b92aa6e
...
am: 811e87ccbb
2017-12-08 01:03:47 +00:00
Dan Shi
34f86d2623
Merge "Create an artifact to include the list of integrated tests in TradeFed" am: 3af39153a8 am: 477427a62c
...
am: 0c76aa1f03
2017-12-08 01:02:33 +00:00
Elliott Hughes
ef40ea28a6
Merge "Explain why BuildImage failed." am: 9a33b96103 am: 76eb8e10ee
...
am: 20742517b4
2017-12-08 01:01:26 +00:00
Colin Cross
1999b3b189
Merge changes Ia7feaa13,Ib917761e am: af3984d26d am: c11df9e038
...
am: 3f74663fdf
2017-12-08 01:00:12 +00:00
Dan Shi
aa9f05a409
Merge "Create artifacts to include the list of test configs" am: c6b28799e9
...
am: 00d3e58d1c
2017-12-08 00:58:12 +00:00
Jaegeuk Kim
10c9f5d9d3
Merge "core, release: add sload.f2fs for otatools.zip"
2017-12-08 00:57:42 +00:00
Dan Shi
00d3e58d1c
Merge "Create artifacts to include the list of test configs"
...
am: c6b28799e9
2017-12-08 00:47:56 +00:00
Treehugger Robot
c6b28799e9
Merge "Create artifacts to include the list of test configs"
2017-12-08 00:43:20 +00:00
Bo Hu
557bc407f6
Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 94ea878ae0 am: 079a9f64ac
...
am: 71900fc787
2017-12-08 00:40:10 +00:00
Colin Cross
baae1f3054
Merge "Add java modules to soong_to_convert.txt" am: fedcf41cc3 am: 2ea0ecdbfe
...
am: f2b5f371ff
2017-12-08 00:30:39 +00:00
Xin Li
3682bc395e
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 5f03da0404 -s ours am: e0b934c66f
...
am: 302b83fbc3
2017-12-08 00:29:41 +00:00
