Commit Graph

15496 Commits

Author SHA1 Message Date
Colin Cross
57d291ecca Merge "Remove LOCAL_PROGUARD_ENABLED := nosystem" am: 2c2cb33830 am: d61a376ec4
am: b9f8265d08

Change-Id: Ifcc17a929f3218fe4052e648d8677ba9e5d471f3
2018-01-03 22:35:57 +00:00
Colin Cross
b9f8265d08 Merge "Remove LOCAL_PROGUARD_ENABLED := nosystem" am: 2c2cb33830
am: d61a376ec4

Change-Id: I3f0c780471bc63ee8bc45db6c508522b7e679f65
2018-01-03 22:32:25 +00:00
Colin Cross
2c2cb33830 Merge "Remove LOCAL_PROGUARD_ENABLED := nosystem" 2018-01-03 22:20:41 +00:00
Colin Cross
268504d237 Merge "Move jacoco before desugar" am: f9a1e6a72a am: c06ecd9a99
am: 2fec0b5d97

Change-Id: Ib71f1bb65b1a2d995a57dc18ff5e384db2fc7cb3
2018-01-03 21:07:29 +00:00
Colin Cross
2fec0b5d97 Merge "Move jacoco before desugar" am: f9a1e6a72a
am: c06ecd9a99

Change-Id: If465e2dcac6fa905210ae2905b453b903581418d
2018-01-03 21:01:38 +00:00
Colin Cross
f9a1e6a72a Merge "Move jacoco before desugar" 2018-01-03 20:50:50 +00:00
Colin Cross
33a6354014 Merge "Update jacoco command line flags for latest version" am: 03cdfcc631 am: 3b45c545ea
am: b305326ae4

Change-Id: If4e47e2a0d5b07896b8572bd4985d8ca69d2f55e
2018-01-03 20:36:11 +00:00
Colin Cross
b305326ae4 Merge "Update jacoco command line flags for latest version" am: 03cdfcc631
am: 3b45c545ea

Change-Id: I499e5e84d2a3b043d2103a36d5ff8fb428be898c
2018-01-03 20:11:57 +00:00
Colin Cross
03cdfcc631 Merge "Update jacoco command line flags for latest version" 2018-01-03 19:45:55 +00:00
Tobias Thierer
822e961511 Build with OpenJDK 9 -target 1.8 by default (attempt 4).
This is cherry-picked from attempt 3, which was reverted
due to http://b/70862583.

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
Change-Id: Ic42a518c90515b497e5cecec444ded373e403a4b
Test: Treehugger
Test: art/test/testrunner/run_build_test_target.py -j40 art-interpreter
Test: dalvik/dx/tests/run-all-tests
2018-01-03 05:11:25 +00:00
Colin Cross
2d96cd1a59 Merge "Revert "Build with OpenJDK 9 -target 1.8 by default (attempt 3)."" 2018-01-03 00:29:43 +00:00
Colin Cross
e616f34431 Remove LOCAL_PROGUARD_ENABLED := nosystem
None of the system options are controversial, and there are no
longer any users of nosystem, so remove it.

Test: m checkbuild
Change-Id: Id1b946d83688d266ca2942c02c97e8b404c3755b
2018-01-02 13:18:04 -08:00
Tobias Thierer
033f848ac4 Merge "Build with OpenJDK 9 -target 1.8 by default (attempt 3)." 2018-01-02 14:07:11 +00:00
Dan Shi
6d4309ac39 Merge "Force test config to be updated when auto_gen_test_config.py is changed" am: a52691b12a am: a05d8cd880
am: 2e0978d48b

Change-Id: I8f89f1d2537a4d7ff92704077765d811f80f98b0
2018-01-02 06:42:54 +00:00
Dan Shi
2e0978d48b Merge "Force test config to be updated when auto_gen_test_config.py is changed" am: a52691b12a
am: a05d8cd880

Change-Id: Ifd6b8d972549ff4e97c031705d09cdc49d55f742
2018-01-02 06:39:16 +00:00
Treehugger Robot
a52691b12a Merge "Force test config to be updated when auto_gen_test_config.py is changed" 2018-01-02 06:27:35 +00:00
Dan Shi
2b334f5c92 Force test config to be updated when auto_gen_test_config.py is changed
Bug: 70981774,69929803
Test: Modify tools/auto_gen_test_config.py, confirm the test config file
is updated.

Change-Id: I55bd07c8bdc6e26f9c8ad6df733d2c5da09d0ceb
2018-01-01 20:26:27 -08:00
Zach Riggle
80b7659db7 Merge "Add support for honggfuzz to BUILD_FUZZ_TEST" 2017-12-28 19:07:36 +00:00
Colin Cross
96873482b0 Move jacoco before desugar
R8 will replace desugar+proguard+dx, which will mean jacoco has to
run before desugar.  In preparation, move jacoco before desugar now.

Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I0627a79ba2f0b26a113d5d8bcc5cb1fda08295a1
2017-12-28 09:39:15 -08:00
Colin Cross
127e7e43d0 Merge changes I84a59a8c,Id7a92fb2 am: 9c2b798143 am: b2b378e007
am: c819a3008a

Change-Id: Ied52a144b5d3ff07b6f0a5a26e5407794dd0cffb
2017-12-28 17:35:09 +00:00
Colin Cross
c819a3008a Merge changes I84a59a8c,Id7a92fb2 am: 9c2b798143
am: b2b378e007

Change-Id: I3e4dacf27fcde94e51d2320d4ba8479c313dcedb
2017-12-28 17:32:06 +00:00
Colin Cross
e4936e1c2d Remove obsolete proguard options
LOCAL_PROGUARD_ENABLED := shrinktests is never set.
proguard_tests.flags is entirely comments.
proguard.emma.flags only references emma classes, but we use
jacoco now.

Test: m checkbuild
Change-Id: I84a59a8c1b66f75d7ccbaa7da8e937430b4490c8
2017-12-28 17:22:30 +00:00
Dan Willemsen
1d64623105 Export proguard flags from static android libraries and aar prebuilts
Test: m Contacts, classes-proguard.jar has same contents
Test: rm -rf out; tapas Contacts; m
Change-Id: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
Merged-In: Id7a92fb2c44913bccbfcbeae127355b4de588e4d
(cherry picked from commit 1417c177ac)
2017-12-28 17:22:19 +00:00
Dan Willemsen
4bcf33404c Merge "Switch some deprecated variables to obsolete" am: 5b82359f85 am: 48a7133006
am: 5a30746f01

Change-Id: If04480f840f489c3de2dda5d19db14aba5aed918
2017-12-28 04:42:57 +00:00
Dan Willemsen
5a30746f01 Merge "Switch some deprecated variables to obsolete" am: 5b82359f85
am: 48a7133006

Change-Id: I85466810f07061ab927b06dd41d54d8e9c9b2bfe
2017-12-28 04:39:16 +00:00
Dan Willemsen
74afb1d993 Switch some deprecated variables to obsolete
These are no longer used.

Test: check build_test logs for "has been deprecated"
Change-Id: Icb13891863d0b9b6a00e18d0f8f88e6306a24f8c
2017-12-27 16:59:38 -08:00
Bo Hu
dbc18ce057 Merge "emulator: add check_emu_boot.mk, again" am: 59e41c11d5 am: d7c9a7384a
am: d49a41350a

Change-Id: I52094812c9214340800f6ed3f0674ff8405b7f0c
2017-12-27 22:32:45 +00:00
Bo Hu
d49a41350a Merge "emulator: add check_emu_boot.mk, again" am: 59e41c11d5
am: d7c9a7384a

Change-Id: Id9b9e9d5421b6f5ba5717bd7c1a13ba8f3e4ac1d
2017-12-27 22:29:40 +00:00
Bo Hu
59e41c11d5 Merge "emulator: add check_emu_boot.mk, again" 2017-12-27 22:22:10 +00:00
Zach Riggle
6319deed41 Add support for honggfuzz to BUILD_FUZZ_TEST
Change-Id: I38f70d1a57649635be95c59187da05ba22fcf687
2017-12-27 22:08:27 +00:00
Sen Jiang
1e1c35d051 Merge "Remove zlib_fingerprint support." am: 53a3f70efe am: 2dfaacdd93
am: c5ed82950b

Change-Id: I25e86717bfaf7f22e41d417d16f7b18d55f26ff1
2017-12-27 21:00:08 +00:00
Sen Jiang
c5ed82950b Merge "Remove zlib_fingerprint support." am: 53a3f70efe
am: 2dfaacdd93

Change-Id: I20d08538fd4642987bdca0aed226c393aa7579ce
2017-12-27 20:57:29 +00:00
Treehugger Robot
53a3f70efe Merge "Remove zlib_fingerprint support." 2017-12-27 20:49:24 +00:00
Jae Shin
fc52ef0a23 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" am: 13349ed3c2 am: a085258968
am: 2dc0a3860e

Change-Id: Ifb8947460156924ac8b682fa66aeaa23c3f3037a
2017-12-26 02:00:51 +00:00
Jae Shin
2dc0a3860e Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" am: 13349ed3c2
am: a085258968

Change-Id: I7d541c300ef228ad045e168a0354ed690686c086
2017-12-26 01:57:46 +00:00
Treehugger Robot
13349ed3c2 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" 2017-12-26 01:51:20 +00:00
Steven Moreland
ed48e5954a Merge "Allow devices to extend the system manifest." am: 15820578b2 am: 152a886de3
am: aac4256fd2

Change-Id: I8c42fd4b758466032cec45a762b079979d0f4fa6
2017-12-23 01:28:37 +00:00
Steven Moreland
aac4256fd2 Merge "Allow devices to extend the system manifest." am: 15820578b2
am: 152a886de3

Change-Id: Id9c2f1be2b56c17fb8417a452b42bb98b4aa7b24
2017-12-23 01:25:37 +00:00
Treehugger Robot
15820578b2 Merge "Allow devices to extend the system manifest." 2017-12-23 01:17:24 +00:00
Steven Moreland
b14b530f82 Allow devices to extend the system manifest.
Introduces DEVICE_FRAMEWORK_MANIFEST_FILE, a list
of files which are added to system/manifest.xml.
This is required for devices to properly display
what hals they implement and also therefore for
them to pass vts_treble_vintf_test since it
now tests manifests based on hal origin.

Notice, this is named singularly to match
DEVICE_MANIFEST_FILE which is also a list of files.
They may be better both named "FILES", but for
consistency and legacy reasons, they can be thought
of as "everything that composes the X manifest
file".

Fixes: 70042049
Test: add system manifest extension which needs it
  and it no longer fails vts_treble_vintf_test for
  hals being served from the wrong partitions.

Change-Id: I1f59d5c3cadb7a7d4576b73196ca7b41103a49c5
2017-12-22 14:02:11 -08:00
bohu
93ac3b81eb emulator: add check_emu_boot.mk, again
"make check_emu_boot" will boot up emulator
and check whether it boots up or timed out.
On boot success, it will emit a file
BOOT_SUCCESS.txt in dist_dir;
On timed out, it will emit a file
BOOT_FAIL.txt in dist_dir

original cl breaks some build, and this
fixes it by incorporating the following cl

https://android-review.googlesource.com/c/platform/build/+/576282

Test: choosecombo 1 aosp_arm64_ab userdebug
      m -j checkbuild tests

Test: make check_emu_boot
Change-Id: I09cba4f8fde672f9ea685dee1c0c108f2c457e2a
2017-12-22 17:51:38 +00:00
Tobias Thierer
db740efdf2 Merge "Revert "emulator: add check_emu_boot.mk"" am: 1d87b803f7 am: e63e713ce3
am: f0a1f751bd

Change-Id: Ica6fcefbc8e7863d7cf601921fb9a6958a34aed9
2017-12-22 15:19:48 +00:00
Tobias Thierer
f0a1f751bd Merge "Revert "emulator: add check_emu_boot.mk"" am: 1d87b803f7
am: e63e713ce3

Change-Id: Id4c00917065f1492720f16ef522c5b97437eb9e6
2017-12-22 15:17:11 +00:00
Treehugger Robot
1d87b803f7 Merge "Revert "emulator: add check_emu_boot.mk"" 2017-12-22 15:10:16 +00:00
Tobias Thierer
e01a5759b7 Revert "emulator: add check_emu_boot.mk"
This reverts commit bba0ef24c2.

Reason for revert: Broke aosp_arm64_ab-userdebug build on internal master.

Change-Id: I04ca552174bc2731cb69ee8485d50f4c190c0d27
2017-12-22 13:31:41 +00:00
Colin Cross
5a32f1c162 Merge "Remove --no-locals -> --release translation" am: d84332eed6 am: 9f8b5703b3
am: eb196fe873

Change-Id: Ie2513a0fbee87255b6c0cc2d39bf6093e435b887
2017-12-22 02:06:04 +00:00
Colin Cross
eb196fe873 Merge "Remove --no-locals -> --release translation" am: d84332eed6
am: 9f8b5703b3

Change-Id: I867e4199d452d865f2f797bd67b2c71de75ae0e5
2017-12-22 02:03:24 +00:00
Treehugger Robot
d84332eed6 Merge "Remove --no-locals -> --release translation" 2017-12-22 01:53:24 +00:00
bohu
73e2e58b9d Merge "emulator: add check_emu_boot.mk" am: 9b04b2984c am: 0b4a1edeae
am: f6ba825c0f

Change-Id: I7ddc02bedd7e56376a98b617e00f1e7a98b99fb4
2017-12-22 01:51:36 +00:00
Jae Shin
0b1792e29b Add check to ensure PLATFORM_VNDK_VERSION is set
Bug: 70918357
Test: m -j vndk dist
Change-Id: Ia4ae94db9feccb7c40edfe90c14eb552b69ef655
2017-12-22 10:46:51 +09:00