Commit Graph

41522 Commits

Author SHA1 Message Date
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
Dan Shi a05d8cd880 Merge "Force test config to be updated when auto_gen_test_config.py is changed"
am: a52691b12a

Change-Id: Ib969a5f9f3cf0ea02843b2265db845b702a8da19
2018-01-02 06:35:56 +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
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 c819a3008a Merge changes I84a59a8c,Id7a92fb2 am: 9c2b798143
am: b2b378e007

Change-Id: I3e4dacf27fcde94e51d2320d4ba8479c313dcedb
2017-12-28 17:32:06 +00:00
Colin Cross b2b378e007 Merge changes I84a59a8c,Id7a92fb2
am: 9c2b798143

Change-Id: Ic613f0a63643346645654cedd233844b8ef9bfb8
2017-12-28 17:29:10 +00:00
Colin Cross 9c2b798143 Merge changes I84a59a8c,Id7a92fb2
* changes:
  Remove obsolete proguard options
  Export proguard flags from static android libraries and aar prebuilts
2017-12-28 17:22:51 +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 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 48a7133006 Merge "Switch some deprecated variables to obsolete"
am: 5b82359f85

Change-Id: Ieb0458ec51418a12aca920285f440540a3cbf24a
2017-12-28 04:36:11 +00:00
Dan Willemsen 5b82359f85 Merge "Switch some deprecated variables to obsolete" 2017-12-28 04:28:48 +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 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 d7c9a7384a Merge "emulator: add check_emu_boot.mk, again"
am: 59e41c11d5

Change-Id: I3ac17edc7dd2e170e36450eba9f988c29a8194f3
2017-12-27 22:26:34 +00:00
Bo Hu 59e41c11d5 Merge "emulator: add check_emu_boot.mk, again" 2017-12-27 22:22:10 +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
Sen Jiang 2dfaacdd93 Merge "Remove zlib_fingerprint support."
am: 53a3f70efe

Change-Id: I4afcbc02ce4da3541319f62eba5ff27e161f335d
2017-12-27 20:54:15 +00:00
Treehugger Robot 53a3f70efe Merge "Remove zlib_fingerprint support." 2017-12-27 20:49:24 +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
Jae Shin a085258968 Merge "Add check to ensure PLATFORM_VNDK_VERSION is set"
am: 13349ed3c2

Change-Id: Ibae825f9cc56606a01905f1b7bae9778275c0064
2017-12-26 01:55:07 +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 aac4256fd2 Merge "Allow devices to extend the system manifest." am: 15820578b2
am: 152a886de3

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

Change-Id: I23cbded9ac506c201bc4f8378dca124a68402f2e
2017-12-23 01:22:33 +00:00
Treehugger Robot 15820578b2 Merge "Allow devices to extend the system manifest." 2017-12-23 01:17:24 +00:00
Justin Yun 72a9d21cb9 Merge "Use current VNDK directories if version is not set on GSI" am: a5af4d920f
am: cc3924fd67

Change-Id: I43850b8c451b9001a4046406fc79b2de6506d295
2017-12-23 00:43:58 +00:00
Justin Yun cc3924fd67 Merge "Use current VNDK directories if version is not set on GSI"
am: a5af4d920f

Change-Id: I6e5abd1191bd469765c5f610bb47d4b1c1baf22f
2017-12-23 00:41:24 +00:00
Treehugger Robot a5af4d920f Merge "Use current VNDK directories if version is not set on GSI" 2017-12-23 00:35:23 +00:00
Dan Shi 7abb8ccbca Merge "Test config should use manifest package attribute" am: a6c3cece9e
am: 4647f8125a

Change-Id: Ie0ede8acaf7085c0312f5305ad6c7b54fd8a09aa
2017-12-22 23:41:46 +00:00
Dan Shi 4647f8125a Merge "Test config should use manifest package attribute"
am: a6c3cece9e

Change-Id: Iad499856cef0be99d8f6af260d05c70c9200bc78
2017-12-22 23:38:44 +00:00
Treehugger Robot a6c3cece9e Merge "Test config should use manifest package attribute" 2017-12-22 23:31:42 +00:00
Justin Yun c104764f73 Use current VNDK directories if version is not set on GSI
Only for GSI, if "ro.vndk.version" property is not defined, the
vendor modules will use current version of VNDK libs.

Bug: 70704112
Test: On Android-P sailfish device, install GSI and check boot
Change-Id: Ib8eb28604ab3e33474179dffbc07358921e7439c
2017-12-23 08:16:59 +09: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
Dan Shi 9a50168c85 Test config should use manifest package attribute
Bug: 70981774,69929803
Test: m -j SetupWizardActivityTests
Change-Id: I6d50744504eac71d6ecae5db9b14e6d30eb923fe
2017-12-22 13:34:50 -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 f0a1f751bd Merge "Revert "emulator: add check_emu_boot.mk"" am: 1d87b803f7
am: e63e713ce3

Change-Id: Id4c00917065f1492720f16ef522c5b97437eb9e6
2017-12-22 15:17:11 +00:00
Tobias Thierer e63e713ce3 Merge "Revert "emulator: add check_emu_boot.mk""
am: 1d87b803f7

Change-Id: I036c4cb23396dbb747852b1c6e52fd3db2a9e2bb
2017-12-22 15:14:33 +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 eb196fe873 Merge "Remove --no-locals -> --release translation" am: d84332eed6
am: 9f8b5703b3

Change-Id: I867e4199d452d865f2f797bd67b2c71de75ae0e5
2017-12-22 02:03:24 +00:00
Colin Cross 9f8b5703b3 Merge "Remove --no-locals -> --release translation"
am: d84332eed6

Change-Id: I448d47a81efb31537d976c84cbe38031507f89f5
2017-12-22 02:00:53 +00:00
Treehugger Robot d84332eed6 Merge "Remove --no-locals -> --release translation" 2017-12-22 01:53:24 +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
bohu f6ba825c0f Merge "emulator: add check_emu_boot.mk" am: 9b04b2984c
am: 0b4a1edeae

Change-Id: Ice2df5213ec17a66d4e5f07a8c04d021f5dea10a
2017-12-22 01:45:54 +00:00
bohu 0b4a1edeae Merge "emulator: add check_emu_boot.mk"
am: 9b04b2984c

Change-Id: I72c8bf4d94b520922b63e0eb2c7e63aeb713c50a
2017-12-22 01:40:48 +00:00
Treehugger Robot 9b04b2984c Merge "emulator: add check_emu_boot.mk" 2017-12-22 01:34:41 +00:00
Tao Bao b4a93bd4c8 Merge "releasetools: Remove the dead code for blockimgdiff_version <= 2." am: be8ea6ec11
am: d052700179

Change-Id: I7108f50d08d13026a5dd414f74f069714b9cf793
2017-12-21 22:37:13 +00:00
Tao Bao d052700179 Merge "releasetools: Remove the dead code for blockimgdiff_version <= 2."
am: be8ea6ec11

Change-Id: I052877e554c87200101c40d53ebb3f51d00e5767
2017-12-21 22:28:36 +00:00
Dan Shi 26201a4d44 Merge "Auto generate test config files" am: 3c28ff7bff
am: 4ccd1a5a00

Change-Id: Ibc089081ab2925f8e3453eddf8c64d81d3b49596
2017-12-21 22:25:40 +00:00