9e67329b15
[DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883
...
am: fb5f3b5add
2017-12-14 20:08:30 +00:00
fb5f3b5add
[DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev
...
bug:70348883
Change-Id: I3e6a87e66cd2c113d2f8fc0e9572b0a2744a6515
2017-12-14 17:30:59 +00:00
07de097829
Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev
...
am: 3c12119266
2017-12-14 01:56:13 +00:00
3c12119266
Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev
2017-12-14 01:44:56 +00:00
6f9cbc5ff9
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours am: 229da9d2f2 am: 590a4d3c6a am: 81f33be96c am: 6fb0dd12a6 am: 7681838a52 -s ours
...
am: c282e0329a
2017-12-14 00:44:57 +00:00
fd1ff31fd6
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508 am: 06602d3239 -s ours am: 3980822dff am: 5d59b6650b am: ca5b4e7969 am: dc0deb3b47 am: 9b1a2b4f98 -s ours
...
am: 27d97699eb
2017-12-14 00:42:57 +00:00
c282e0329a
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours am: 229da9d2f2 am: 590a4d3c6a am: 81f33be96c am: 6fb0dd12a6
...
am: 7681838a52
2017-12-14 00:38:00 +00:00
27d97699eb
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508 am: 06602d3239 -s ours am: 3980822dff am: 5d59b6650b am: ca5b4e7969 am: dc0deb3b47
...
am: 9b1a2b4f98
2017-12-14 00:37:20 +00:00
7681838a52
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours am: 229da9d2f2 am: 590a4d3c6a am: 81f33be96c
...
am: 6fb0dd12a6
2017-12-14 00:35:14 +00:00
9b1a2b4f98
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508 am: 06602d3239 -s ours am: 3980822dff am: 5d59b6650b am: ca5b4e7969
...
am: dc0deb3b47
2017-12-14 00:34:12 +00:00
6fb0dd12a6
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours am: 229da9d2f2 am: 590a4d3c6a
...
am: 81f33be96c
2017-12-14 00:31:04 +00:00
dc0deb3b47
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508 am: 06602d3239 -s ours am: 3980822dff am: 5d59b6650b
...
am: ca5b4e7969
2017-12-14 00:29:38 +00:00
81f33be96c
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours am: 229da9d2f2
...
am: 590a4d3c6a
2017-12-14 00:24:09 +00:00
ca5b4e7969
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508 am: 06602d3239 -s ours am: 3980822dff
...
am: 5d59b6650b
2017-12-14 00:22:42 +00:00
590a4d3c6a
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c am: a645938f45 -s ours
...
am: 229da9d2f2
2017-12-14 00:20:38 +00:00
5d59b6650b
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508 am: 06602d3239 -s ours
...
am: 3980822dff
2017-12-14 00:19:32 +00:00
229da9d2f2
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa am: a67af52d8c
...
am: a645938f45
2017-12-14 00:15:39 +00:00
3980822dff
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b am: 567d926508
...
am: 06602d3239
2017-12-14 00:14:42 +00:00
a645938f45
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f am: d572ee7efa
...
am: a67af52d8c
2017-12-14 00:11:19 +00:00
06602d3239
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b
...
am: 567d926508
2017-12-14 00:10:21 +00:00
a67af52d8c
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours am: b22c56332f
...
am: d572ee7efa
2017-12-14 00:05:26 +00:00
567d926508
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f
...
am: 6545915c0b
2017-12-14 00:03:15 +00:00
d572ee7efa
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours
...
am: b22c56332f
2017-12-13 23:59:29 +00:00
6545915c0b
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883
...
am: 74f105c16f
2017-12-13 23:58:16 +00:00
b22c56332f
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883
...
am: fedac8dbc2
2017-12-13 23:53:49 +00:00
ee2346fa89
[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev
...
bug:70348883
Change-Id: Ib87775083eb064c485a44dffcf3b4630d33d39c5
2017-12-13 23:02:17 +00:00
74f105c16f
[DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev
...
bug:70348883
2017-12-13 22:53:20 +00:00
fedac8dbc2
[DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev
...
bug:70348883
2017-12-13 22:52:14 +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
5cf66c7496
resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d
...
am: 73d1c9c6d9
2017-12-08 03:51:35 +00:00
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
5a8f82d4a1
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112
...
am: a749d6bdb5
2017-12-08 03:47:33 +00:00
73d1c9c6d9
resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032
...
am: e53bed3f7d
2017-12-08 03:47:33 +00:00
e53bed3f7d
resolve merge conflicts of e4f7788661 to nyc-dr1-dev
...
am: 78f5ddb032
2017-12-08 03:43:31 +00:00
a749d6bdb5
Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories.
...
am: 0dd1fb9112
2017-12-08 03:43:26 +00:00
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
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
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
b4bd17c9ad
initial add sts to build
...
am: bb7a920294
2017-12-06 18:16:11 +00:00
bb7a920294
initial add sts to build
...
Test: Local build with other CLs in topic
Bug: 67456333
Change-Id: Ieea499fc22b6dff87dfb19fb8b9446fa449152ea
(cherry picked from commit a4560bb0cb
2017-12-05 22:17:31 +00:00
d234819842
Output *TS testcases to their own subdir in the common testcase folders.
...
Instead of dumping all *TS testcases into the common testcase
directory directly, place them all in their own subdirectory.
Bug: 35153177
Test: `make cts -j` and checked the contents of both:
out/host/linux-x86/testcases/ &
out/host/linux-x86/cts/android-cts/testcases/
Change-Id: I22a768dba58d40be1e61885534fb813e7ff08c99
(cherry picked from commit 3fb354cca0
2017-12-01 12:56:45 -08:00
27c29368b8
Output *TS testcases to common testcase folders.
...
Aggregates the different *TS testcases into two common folders,
one under each the host and product hierarchies.
Bug: 34715822
Test: `make cts -j` and checked the contents of both:
out/host/linux-x86/testcases/ &
out/host/linux-x86/cts/android-cts/testcases/
Change-Id: I7d5201998ddcb011ecc687c272a0d0a36da248b7
(cherry picked from commit adf63b777a9b7ef1f223f01f3686ed7eb6b48119)
Merged-In: I7d5201998ddcb011ecc687c272a0d0a36da248b7
2017-12-01 12:56:27 -08:00
ec071e07df
[DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226
...
am: b58800a22c
2017-11-14 00:52:23 +00:00
b58800a22c
[DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01
...
Bug: 69257226
2017-11-13 22:23:06 +00:00
ec439b54fb
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev
...
am: 9a8d84b8ed
2017-11-13 21:54:22 +00:00
9a8d84b8ed
Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev
2017-11-13 21:47:00 +00:00
Adam Seaton