Commit graph

37043 commits

Author SHA1 Message Date
Adam Seaton
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
Simran Basi
203a1f407b Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5 am: 5a8f82d4a1 am: 7b26faa5ea
am: acaa4cc623  -s ours

Change-Id: I670716ca7eff2e8d7cf099d4e1c5ecfb82b4f847
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  -s ours

Change-Id: Ic73ef3b08a9703639cd4cf0ddf608d00192bc62c
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

Change-Id: Ib60ff55bc957ec1a23a9267b9a8bd849d081f2f7
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

Change-Id: Ib4ccc6f19c83595b9b27af6ca72f553a026f80e1
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

Change-Id: I065f498ba2fb95f772759bc5e8fd5e2c0d962975
2017-12-08 03:50:33 +00:00
Ryan Longair
73d1c9c6d9 resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032
am: e53bed3f7d

Change-Id: I5ceb0419bf68823577bec1e77a966d128420d7de
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

Change-Id: I0e00248c2da4d49f37fa3e8ebf2e1ed5d1252ee1
2017-12-08 03:47:33 +00:00
Ryan Longair
e53bed3f7d resolve merge conflicts of e4f7788661 to nyc-dr1-dev
am: 78f5ddb032

Change-Id: I6682fbcbd6cfd793b36813a6004fa5f46ce63d8a
2017-12-08 03:43:31 +00:00
Simran Basi
a749d6bdb5 Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories.
am: 0dd1fb9112

Change-Id: Ia8733e00b476a40b29bd7f41b4d8cc8ae59260cc
2017-12-08 03:43:26 +00: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
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)
Merged-In: Ic4c4e87e62be4fc0c5e394d88cc359518346dffa
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)
Merged-In: I77529021e852af35571fb99537d87100010b47af
2017-12-07 23:38:06 +00:00
Badash
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
Simran Basi
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)
Merged-In: I22a768dba58d40be1e61885534fb813e7ff08c99
2017-12-01 12:56:45 -08:00
Simran Basi
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
Elisa Pascual Trevino
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
TreeHugger Robot
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
Elisa Pascual Trevino
a80c186e97 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429 am: 7a58ff0c94 am: 590dbe143d
am: 71b1a4d8ea  -s ours

Change-Id: I862603d1941915c360b0dda3698da88ac7859748
2017-11-13 20:53:29 +00:00
Elisa Pascual Trevino
71b1a4d8ea Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429 am: 7a58ff0c94
am: 590dbe143d

Change-Id: Iffff10dd426f956a4a99b3177b0e4863e532c70e
2017-11-13 20:49:54 +00:00
Elisa Pascual Trevino
590dbe143d Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a am: 3fea140429
am: 7a58ff0c94

Change-Id: I8216dc0c59b3a54673794957c1036070d9465b20
2017-11-13 20:46:44 +00:00
Elisa Pascual Trevino
7a58ff0c94 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a
am: 3fea140429

Change-Id: I25d21d5613829b527d8c8d9e986c2ae3d74cde17
2017-11-13 20:42:38 +00:00
Elisa Pascual Trevino
3fea140429 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev
am: 5b0a42789a

Change-Id: I9f09f136a764aee7fd98ac7ad49d571927e693be
2017-11-13 20:38:40 +00:00
Elisa Pascual Trevino
dfef936beb Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4 am: 5dee805136 am: a623ac9e10 am: c0ea47faf5 -s ours am: 87589b0faf am: f686b8e219 am: 87aa71a0d6 am: 0646a5609f
am: b39c51f1b3  -s ours

Change-Id: I33895581acacee665d0e3881cab894145cc20c51
2017-11-13 20:36:27 +00:00
Elisa Pascual Trevino
b39c51f1b3 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4 am: 5dee805136 am: a623ac9e10 am: c0ea47faf5 -s ours am: 87589b0faf am: f686b8e219 am: 87aa71a0d6
am: 0646a5609f

Change-Id: I96250ec1405895a4f62bca3975ada4871288c254
2017-11-13 20:34:20 +00:00
TreeHugger Robot
5b0a42789a Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev 2017-11-13 20:33:33 +00:00
Elisa Pascual Trevino
0646a5609f Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4 am: 5dee805136 am: a623ac9e10 am: c0ea47faf5 -s ours am: 87589b0faf am: f686b8e219
am: 87aa71a0d6

Change-Id: Ia39c79a77dc17a3535ea7f36fb5278ef4abdfaa5
2017-11-13 20:32:18 +00:00
Elisa Pascual Trevino
ec5ef1c8b3 [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours am: 2a81f8159f -s ours am: e9e54c59aa am: 81099d1dcb am: 7d4d9a50d8 am: c4a00faf15 -s ours am: 9381b6b193 am: c4233bcb8e am: 0f910b71e7 am: 78535d96c5
am: 6ee7f66356  -s ours

Change-Id: Ic9720186613bae8e17bbc8624fad1a5154e30135
2017-11-13 20:30:59 +00:00
Elisa Pascual Trevino
87aa71a0d6 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4 am: 5dee805136 am: a623ac9e10 am: c0ea47faf5 -s ours am: 87589b0faf
am: f686b8e219

Change-Id: Iefd2d76df2c35ee22ba093e1ea7ba0e4f539615d
2017-11-13 20:30:13 +00:00
Elisa Pascual Trevino
6ee7f66356 [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours am: 2a81f8159f -s ours am: e9e54c59aa am: 81099d1dcb am: 7d4d9a50d8 am: c4a00faf15 -s ours am: 9381b6b193 am: c4233bcb8e am: 0f910b71e7
am: 78535d96c5

Change-Id: I6f7dae44b9c1d87812a69656150862285139f6fc
2017-11-13 20:28:22 +00:00
Elisa Pascual Trevino
f686b8e219 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4 am: 5dee805136 am: a623ac9e10 am: c0ea47faf5 -s ours
am: 87589b0faf

Change-Id: I2fd3754ca068edc5d0e4a79fcc5f17290a40431d
2017-11-13 20:28:11 +00:00
Elisa Pascual Trevino
87589b0faf Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4 am: 5dee805136 am: a623ac9e10
am: c0ea47faf5  -s ours

Change-Id: I93eca47ffff730f9a7e535ca0d58ab869dc8596a
2017-11-13 20:25:56 +00:00
Elisa Pascual Trevino
78535d96c5 [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours am: 2a81f8159f -s ours am: e9e54c59aa am: 81099d1dcb am: 7d4d9a50d8 am: c4a00faf15 -s ours am: 9381b6b193 am: c4233bcb8e
am: 0f910b71e7

Change-Id: Ia794ba3859ad17459be162579a0f099a171d982a
2017-11-13 20:24:18 +00:00
Elisa Pascual Trevino
c0ea47faf5 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4 am: 5dee805136
am: a623ac9e10

Change-Id: I50a40c0f00e65cb0efbd475a999e05c06d07a8c6
2017-11-13 20:24:06 +00:00
Elisa Pascual Trevino
0f910b71e7 [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours am: 2a81f8159f -s ours am: e9e54c59aa am: 81099d1dcb am: 7d4d9a50d8 am: c4a00faf15 -s ours am: 9381b6b193
am: c4233bcb8e

Change-Id: I01823b24313ba1c93b51e75126199a536341c95e
2017-11-13 20:21:45 +00:00
Elisa Pascual Trevino
a623ac9e10 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev am: a246e378c4
am: 5dee805136

Change-Id: I68aa377b98b330ad7050538c47728d4ff728410e
2017-11-13 20:20:03 +00:00
Elisa Pascual Trevino
c4233bcb8e [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours am: 2a81f8159f -s ours am: e9e54c59aa am: 81099d1dcb am: 7d4d9a50d8 am: c4a00faf15 -s ours
am: 9381b6b193

Change-Id: I040c113c51429ba5e6f275aaa27b05ac6105c637
2017-11-13 20:19:43 +00:00
Elisa Pascual Trevino
5dee805136 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev
am: a246e378c4

Change-Id: If4d89287dd72bb074ef348ee41bb59f88f05ca5d
2017-11-13 20:17:34 +00:00
Elisa Pascual Trevino
9381b6b193 [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours am: 2a81f8159f -s ours am: e9e54c59aa am: 81099d1dcb am: 7d4d9a50d8
am: c4a00faf15  -s ours

Change-Id: I7831d283f381a1251b0854b4835c21be565d1391
2017-11-13 20:15:56 +00:00
Elisa Pascual Trevino
c4a00faf15 [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours am: 2a81f8159f -s ours am: e9e54c59aa am: 81099d1dcb
am: 7d4d9a50d8

Change-Id: Ic457f5ae443c68d83d7c5bf78d4475625a90d184
2017-11-13 20:13:36 +00:00
TreeHugger Robot
a246e378c4 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into mnc-dev 2017-11-13 20:12:21 +00:00
Elisa Pascual Trevino
7d4d9a50d8 [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours am: 2a81f8159f -s ours am: e9e54c59aa
am: 81099d1dcb

Change-Id: Ia5bd95f347b19731ee2ad4bf101fea2f2cc8d27d
2017-11-13 20:10:04 +00:00
Elisa Pascual Trevino
81099d1dcb [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours am: 2a81f8159f -s ours
am: e9e54c59aa

Change-Id: Iac321f1bb0261acfa78beedbe829442826fee3be
2017-11-13 20:07:03 +00:00
Elisa Pascual Trevino
e9e54c59aa [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226 am: 7da2c1c459 -s ours
am: 2a81f8159f  -s ours

Change-Id: I5d924bdbdc3a922b7c4677095c0cbf787ffcbc22
2017-11-13 20:04:55 +00:00
Elisa Pascual Trevino
2a81f8159f [DO NOT MERGE] Update Security String to 2018-01-01 Bug : 69257226
am: 7da2c1c459  -s ours

Change-Id: Id11839c527c66d1d0b00f7851d5c9e6f0be6ae86
2017-11-13 20:02:24 +00:00
Elisa Pascual Trevino
c53a14f174 [DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05
Bug: 69257226
2017-11-13 19:28:32 +00:00
Elisa Pascual Trevino
b2cf11f275 [DO NOT MERGE] Update Security String to 2018-01-01
Bug: 69257226
2017-11-13 19:24:54 +00:00
Elisa Pascual Trevino
50511f6a4e [DO NOT MERGE] Update Security String to 2018-01-01
Bug: 69257226
2017-11-13 19:21:43 +00:00
Elisa Pascual Trevino
7da2c1c459 [DO NOT MERGE] Update Security String to 2018-01-01
Bug : 69257226
2017-11-13 19:16:16 +00:00
TreeHugger Robot
8fdda7d80d Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev 2017-11-03 23:51:15 +00:00