openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
29,868 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

29868 Commits

Author SHA1 Message Date
Elisa Pascual Trevino 5a53ba3eb3 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03 am: 4ab30bc502 
am: f113fe294c

Change-Id: I620835e63f499c8e1b8260b5b1414f84d3286eba
 2018-01-12 00:40:01 +00:00
Elisa Pascual Trevino f113fe294c Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev am: c3aee02b03 
am: 4ab30bc502

Change-Id: I5c38e422102517f52e0aacfabbf63918cd9de7a5
 2018-01-12 00:31:38 +00:00
Elisa Pascual Trevino 4ab30bc502 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev 
am: c3aee02b03

Change-Id: I2db4d77ae94e11c304cbbe74557e5c6f42c8a6cd
 2018-01-12 00:26:24 +00:00
TreeHugger Robot c3aee02b03 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev 2018-01-12 00:19:37 +00:00
Elisa Pascual Trevino 2daf3f586c [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86 am: 6619c472f3 
am: a1c02ac99e

Change-Id: Ic6f9e8e25a106a49986683e8f23f641d0cc749f5
 2018-01-12 00:07:13 +00:00
Elisa Pascual Trevino a1c02ac99e [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours am: cd6054fa86 
am: 6619c472f3

Change-Id: I23f4290b7f7cdbc30ea9b36530421b9a14a50d26
 2018-01-12 00:03:48 +00:00
Elisa Pascual Trevino 6619c472f3 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed am: 51e7d3a175 -s ours 
am: cd6054fa86

Change-Id: I2bfc125bbc7cf0f23c90b82d4b739d66b8de24b8
 2018-01-11 23:57:20 +00:00
Elisa Pascual Trevino cd6054fa86 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 am: 81e61008ed 
am: 51e7d3a175  -s ours

Change-Id: Ie369373e406d1bda3c3fe19497b49bcaf2cffccd
 2018-01-11 23:54:59 +00:00
Elisa Pascual Trevino 51e7d3a175 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df am: a615903311 
am: 81e61008ed

Change-Id: I2822ff9851b4c6981168979ed80e6a8ae5ad255a
 2018-01-11 23:49:37 +00:00
Elisa Pascual Trevino 81e61008ed [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 am: fa4234e1df 
am: a615903311

Change-Id: I93a3d87c3410fbf38ce60a6c8d56570c8d75fe9e
 2018-01-11 23:47:03 +00:00
Elisa Pascual Trevino a615903311 [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev Bug:71860241 
am: fa4234e1df

Change-Id: I73be513192a58a2467ab00ae1b1a4c0c00e9c712
 2018-01-11 23:43:31 +00:00
Elisa Pascual Trevino d20489e397 [DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev 
Bug:71860241
 2018-01-11 22:58:39 +00:00
Elisa Pascual Trevino fa4234e1df [DO NOT MERGE] Update security string to 2018-03-01 for mnc-dev 
Bug:71860241
 2018-01-11 22:46:05 +00:00
Adam Seaton 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

Change-Id: I511f1ca37ea9d933966bc0656c9ab74e678d1790
 2017-12-14 00:31:04 +00:00
Adam Seaton 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

Change-Id: Ib02b7dc53426a1ee0ad051c1c31997c9b8ff2dfc
 2017-12-14 00:29:38 +00:00
Adam Seaton 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

Change-Id: Ifeb9761f78989eaf144d8b66a9325d24ab73aac1
 2017-12-14 00:24:09 +00:00
Adam Seaton 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

Change-Id: I4ff20889f9e42cc1520844aacc11cab3bdcf0fd0
 2017-12-14 00:22:42 +00:00
Adam Seaton 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

Change-Id: I0de04527cf31be0d497beab0ef87bda41048a549
 2017-12-14 00:20:38 +00:00
Adam Seaton 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

Change-Id: I80365112878b90cdd62979372cfe275d3e22eaa8
 2017-12-14 00:19:32 +00:00
Adam Seaton 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  -s ours

Change-Id: I18294ae07d2f8a5559e9a6f5c67564bb80c5d001
 2017-12-14 00:15:39 +00:00
Adam Seaton 3980822dff [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

Change-Id: I4860dff39bd720dd7cb77b9aa5fb4477641b68cf
 2017-12-14 00:14:42 +00:00
Adam Seaton 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

Change-Id: I18eea5ae54ab31911b80c087574ef5f876ecaa08
 2017-12-14 00:11:19 +00:00
Adam Seaton 06602d3239 [DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f am: 6545915c0b 
am: 567d926508

Change-Id: I57ad069f46fed008c1c5e464ed0e6a0a9f9b39bb
 2017-12-14 00:10:21 +00:00
Adam Seaton 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

Change-Id: Ib975688dff6341cb018fb2bee5481fc7f37ca344
 2017-12-14 00:05:26 +00:00
Adam Seaton 567d926508 [DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 am: 74f105c16f 
am: 6545915c0b

Change-Id: I4bcddb5a2505f03e8ff386521728d6576db146e3
 2017-12-14 00:03:15 +00:00
Adam Seaton d572ee7efa [DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 am: fedac8dbc2 -s ours 
am: b22c56332f

Change-Id: I3e4ea584b1407b18f654621902c85f86b87558db
 2017-12-13 23:59:29 +00:00
Adam Seaton 6545915c0b [DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev bug:70348883 
am: 74f105c16f

Change-Id: Ia064b924f328758c8aa9a1e8b4d24fad0ddff11c
 2017-12-13 23:58:16 +00:00
Adam Seaton b22c56332f [DO NOT MERGE] Update security string to 2018-02-01 for lmp-mr1-dev bug:70348883 
am: fedac8dbc2  -s ours

Change-Id: Id1387d01d4ad576420f6441b08d1175baf7fda8b
 2017-12-13 23:53:49 +00:00
Adam Seaton 74f105c16f [DO NOT MERGE] Update security string to 2018-02-01 for mnc-dev 
bug:70348883
 2017-12-13 22:53:20 +00:00
Adam Seaton 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
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
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 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
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
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 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
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 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 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