Elliott Hughes
811e87ccbb
Merge "Get off my lawn forever!" am: 68a6b90f6b
...
am: de2b92aa6e
2017-12-07 23:53:07 +00:00
Elliott Hughes
de2b92aa6e
Merge "Get off my lawn forever!"
...
am: 68a6b90f6b
2017-12-07 23:48:04 +00:00
Simran Basi
0dd1fb9112
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories.
...
1) Updates the LOCAL_COMPATIBILITY_SUITE line to allow for a
testcase to belong to multiple suites.
2) Building testcases no longer fails if
COMPATIBILITY_TESTCASES_OUT_<suite> is not defined. This
testcase will just not output to that directory.
This will be utilized by the device-tests and general-tests
suites that don't require any extra output besides the common
testcase directory.
Bug: 35394351
Test: 1) Added multiple *TS testcases to cts & vts and verified they
ended up in the common directory and each suite's testcase
directory. Specifically tested CtsSplitApp to ensure the
split usecase still works as well.
2) Added a CTS testcase to the device-tests suite, built
device-tests and verified the cts/android-cts/testcases
copy was not produced.
Change-Id: Ic4c4e87e62be4fc0c5e394d88cc359518346dffa
(cherry picked from commit 6bea37c7fa
2017-12-07 23:38:22 +00:00
Simran Basi
e4f7788661
Update CleanSpec.mk for the common testcase directories.
...
Fix an issue with incremental builds and the new common
testcase directories.
Bug: 67456333
Test: Removed https://android-review.googlesource.com/#/c/234478/
then ran `m cts-platform-version-check` then reapplied the
change to verify the failure. Then applied this new change
to verify the problem was resolved.
Change-Id: I77529021e852af35571fb99537d87100010b47af
(cherry picked from commit 7fe57cfdcd
2017-12-07 23:38:06 +00:00
Treehugger Robot
68a6b90f6b
Merge "Get off my lawn forever!"
2017-12-07 23:33:40 +00:00
Stephen Li
813b511529
Manually merge changes from giant AOSP topic
...
Change-Id: I77f2407fb5223146c450f99516fbca55ab3aa900
2017-12-07 23:29:16 +00:00
Dan Shi
8f1263114b
Create artifacts to include the list of test configs
...
Bug: 69678490
Test: m -j dist device-tests general-tests
confirm out/dist has device-tests_list.zip and general-tests_list.zip
Change-Id: I185bc66907e37aa5f5da70b2d1b838a73d5f1a51
2017-12-07 14:37:05 -08:00
Dan Shi
0c76aa1f03
Merge "Create an artifact to include the list of integrated tests in TradeFed" am: 3af39153a8
...
am: 477427a62c
2017-12-07 22:19:20 +00:00
Elliott Hughes
20742517b4
Merge "Explain why BuildImage failed." am: 9a33b96103
...
am: 76eb8e10ee
2017-12-07 22:18:13 +00:00
Dan Shi
477427a62c
Merge "Create an artifact to include the list of integrated tests in TradeFed"
...
am: 3af39153a8
2017-12-07 22:12:20 +00:00
Elliott Hughes
76eb8e10ee
Merge "Explain why BuildImage failed."
...
am: 9a33b96103
2017-12-07 22:08:40 +00:00
Treehugger Robot
3af39153a8
Merge "Create an artifact to include the list of integrated tests in TradeFed"
2017-12-07 22:07:43 +00:00
Elliott Hughes
7a6ef87cbe
Get off my lawn forever!
...
Let folks opt in if they want the custom title.
Bug: https://issuetracker.google.com/38402256
Test: hitting enter no longer flashes this title
Change-Id: I8c1e1b22cc47ab9496797328fb1b13c0827840b0
2017-12-07 13:51:23 -08:00
Treehugger Robot
9a33b96103
Merge "Explain why BuildImage failed."
2017-12-07 21:45:59 +00:00
Bo Hu
8c53016e30
Revert "Renames sepolicy files from nonplat_* to vendor_*"
...
This reverts commit 38c404c6da9eb4d74e26
2017-12-07 07:08:35 -08:00
Colin Cross
3f74663fdf
Merge changes Ia7feaa13,Ib917761e am: af3984d26d
...
am: c11df9e038
2017-12-07 08:50:12 +00:00
Bo Hu
71900fc787
Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 94ea878ae0
...
am: 079a9f64ac
2017-12-07 08:29:54 +00:00
Colin Cross
f2b5f371ff
Merge "Add java modules to soong_to_convert.txt" am: fedcf41cc3
...
am: 2ea0ecdbfe
2017-12-07 08:27:52 +00:00
Xin Li
302b83fbc3
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 5f03da0404 -s ours
...
am: e0b934c66f
2017-12-07 08:26:51 +00:00
Isaac Chen
d9fed02138
Enable VNDK for aosp_x86 and aosp_x86_64
...
When VNDK version is not enabled, libminijail.so are built under
system directory. It is not found in GSI, though.
Enable VNDK version causes it to be built under vendor directory.
Bug: 69395141
Test: Both of the following 2 products can boot to home screen.
$ lunch aosp_x86-userdebug; m -j; emulator
$ lunch aosp_x86_64-userdebug; m -j; emulator
Change-Id: I6356ffe4a806b3d8fc79057bf772d139209a5f11
Merged-In: I6356ffe4a806b3d8fc79057bf772d139209a5f11
(cherry picked from commit 532d5adf7b
2017-12-07 15:03:25 +08:00
Colin Cross
c11df9e038
Merge changes Ia7feaa13,Ib917761e
...
am: af3984d26d
2017-12-07 06:37:41 +00:00
Bo Hu
079a9f64ac
Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*""
...
am: 94ea878ae0
2017-12-07 06:22:44 +00:00
Colin Cross
2ea0ecdbfe
Merge "Add java modules to soong_to_convert.txt"
...
am: fedcf41cc3
2017-12-07 06:21:52 +00:00
Xin Li
e0b934c66f
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
...
am: 5f03da0404
2017-12-07 06:20:32 +00:00
Xin Li
883c2cb2d0
DO NOT MERGE: Merge Oreo MR1 into master am: 6bbcc2cbd4 -s ours
...
am: ce7fb01909
2017-12-07 06:14:52 +00:00
Treehugger Robot
af3984d26d
Merge changes Ia7feaa13,Ib917761e
...
* changes:
Add dependency on jacoco-report-classes.jar
Fix dex_preopt with profile on a soong module
2017-12-07 04:20:25 +00:00
Treehugger Robot
94ea878ae0
Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*""
2017-12-07 04:02:29 +00:00
Dan Shi
d5424cfa3d
Merge "Add build script to generate TF test XML file with filters" am: 0765d53239 am: 515896c436
...
am: da1ba69776
2017-12-07 04:01:42 +00:00
Dan Shi
da1ba69776
Merge "Add build script to generate TF test XML file with filters" am: 0765d53239
...
am: 515896c436
2017-12-07 03:58:20 +00:00
Xin Li
ce7fb01909
DO NOT MERGE: Merge Oreo MR1 into master
...
am: 6bbcc2cbd4
2017-12-07 03:50:49 +00:00
Dan Shi
515896c436
Merge "Add build script to generate TF test XML file with filters"
...
am: 0765d53239
2017-12-07 03:49:57 +00:00
David Zeuthen
6fc59b3328
Merge "AVB: If building recovery.img, add AVB hash footer." am: 7b2129f101 am: 0c1c47f700
...
am: 3f41c5ff1f
2017-12-07 03:37:04 +00:00
David Zeuthen
3f41c5ff1f
Merge "AVB: If building recovery.img, add AVB hash footer." am: 7b2129f101
...
am: 0c1c47f700
2017-12-07 02:17:17 +00:00
Dan Shi
567eede9b6
Create an artifact to include the list of integrated tests in TradeFed
...
In TF projects, we can add dir to COMPATIBILITY.tradefed_tests_dir to
include the test names in the artifact, e.g.,
LOCAL_PATH := $(call my-dir)
COMPATIBILITY.tradefed_tests_dir := \
$(COMPATIBILITY.tradefed_tests_dir) $(LOCAL_PATH)/res/config
Bug: 69678490
Test: m -j dist tradefed-tests-list
Confirm out/dist/tradefed-tests-list.zip exists and has a file
tradefed-tests-list which contains the list of tests.
Change-Id: I67b82e5aeec68e9263bada198669b4a23a0750cb
2017-12-06 17:19:13 -08:00
Treehugger Robot
fedcf41cc3
Merge "Add java modules to soong_to_convert.txt"
2017-12-07 01:04:27 +00:00
Simran Basi
5691cb8b9a
base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders.
...
* Moves the test data logic up to before suite logic.
* Saves the source to relative dest pairs.
* Re-uses the saved source to relative dest pairs when generating
the src:dst pairs for suites.
Bug: 69802886
Test: Build a native test with test data and ensured test data
ended up in each arch specific destination folder.
Change-Id: I52cf8771487fb52276f5e6aae5b8eecb222544d7
2017-12-06 16:42:45 -08:00
Bo Hu
9eb4d74e26
Revert "Renames sepolicy files from nonplat_* to vendor_*"
...
This reverts commit 38c404c6da
2017-12-07 00:16:35 +00:00
Colin Cross
fdea893833
Replace build/tools with build/make/tools
...
Test: m checkbuild
Change-Id: I8db6c27a6d2372f142d10568fe92d6f2e9a59252
2017-12-06 16:12:40 -08:00
Colin Cross
8cd412feee
Add dependency on jacoco-report-classes.jar
...
jacoco-report-classes.jar is found by a glob, so there is no
explicit dependency on it. Add a dependency to javalib.jar so
that it gets installed.
Bug: 70295664
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_STATIC=true WITH_DEXPREPOT=false
Change-Id: Ia7feaa132879539f88c08a49148e4bbb5a141eab
2017-12-06 16:12:39 -08:00
Colin Cross
d2e54d2362
Fix dex_preopt with profile on a soong module
...
The oreo merge to AOSP master added a new variable that must
be set when dex preopting a java module with a profile.
Test: m checkbuild
Change-Id: Ib917761ea4fea481e32f3fb663a18b882a13f4a1
2017-12-06 16:12:39 -08:00
David Zeuthen
0c1c47f700
Merge "AVB: If building recovery.img, add AVB hash footer."
...
am: 7b2129f101
2017-12-06 23:59:52 +00:00
Colin Cross
3277ba34ae
Add java modules to soong_to_convert.txt
...
Test: examine soong_to_convert.txt
Change-Id: Ibb6db664238a4e98f5d8885dfb3ddc0f35d11ff6
2017-12-06 15:38:52 -08:00
Xin Li
5f03da0404
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
2017-12-06 23:18:30 +00:00
Treehugger Robot
0765d53239
Merge "Add build script to generate TF test XML file with filters"
2017-12-06 22:51:43 +00:00
Xin Li
6bbcc2cbd4
DO NOT MERGE: Merge Oreo MR1 into master
...
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Idcd6eeddfdeec156f0e19e617129561c33d32fdc
2017-12-06 14:24:42 -08:00
Jeff Gaston
2936701ffe
Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" am: 5313503663 am: a659799786
...
am: c0715eb231
2017-12-06 22:21:38 +00:00
Treehugger Robot
7b2129f101
Merge "AVB: If building recovery.img, add AVB hash footer."
2017-12-06 22:12:25 +00:00
Jeff Gaston
c0715eb231
Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" am: 5313503663
...
am: a659799786
2017-12-06 21:43:29 +00:00
Jeff Gaston
a659799786
Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting"
...
am: 5313503663
2017-12-06 21:37:10 +00:00
Jeff Gaston
5313503663
Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting"
2017-12-06 21:28:28 +00:00
