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

41824 Commits

Author SHA1 Message Date
Yifan Hong 6ce074f2de PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated. 
It is replaced by FCM Version specified in the device manifest
directly.

Test: builds
Bug: 69636193
Change-Id: I9e2b871b4c6190107ba9fbb36495bb41c461a0a3
 2017-12-13 12:16:15 -08:00
Søren Gjesse 463c9e7bc6 Merge "Revert "Enable R8 by default"" am: 5006ee95fc am: 9a6273a947 
am: a7632a0e98

Change-Id: Ia1ae802ebdea0a99f8b1020ca81cf03d43aa9c95
 2017-12-11 10:47:43 +00:00
Søren Gjesse a7632a0e98 Merge "Revert "Enable R8 by default"" am: 5006ee95fc 
am: 9a6273a947

Change-Id: I3ca14e74a8e71663603a25ed68139f3e2aa84345
 2017-12-11 10:44:06 +00:00
Søren Gjesse 9a6273a947 Merge "Revert "Enable R8 by default"" 
am: 5006ee95fc

Change-Id: Id1daece62d540973fb2ba5b127eb8e781d4e9c07
 2017-12-11 10:41:02 +00:00
Søren Gjesse 5006ee95fc Merge "Revert "Enable R8 by default"" 2017-12-11 10:34:02 +00:00
Søren Gjesse c2afe55679 Revert "Enable R8 by default" 
This reverts commit 7fbc84686c.

Reason for revert: Build failures on oc-mr1-dev-plus-aosp, b/70486468.

Change-Id: I8c1bf38355b1e35748e065d39038c2aaf37c64af
Exempt-From-Owner-Approval: Revert due to build failures
 2017-12-11 10:29:07 +00:00
Søren Gjesse 533789f032 Merge "Enable R8 by default" am: f93deb040d am: adf6c87cd0 
am: a942359cbb

Change-Id: Iff28ce49c5957ac7e0e82f1c466134b5c3943404
 2017-12-11 07:43:13 +00:00
Søren Gjesse a942359cbb Merge "Enable R8 by default" am: f93deb040d 
am: adf6c87cd0

Change-Id: If20a9c11a6d3194d0e59c85ad0b18ad22e99da02
 2017-12-11 07:37:10 +00:00
Søren Gjesse adf6c87cd0 Merge "Enable R8 by default" 
am: f93deb040d

Change-Id: I908f2b27a311a038f9574ea58b75fcfd0b9c8736
 2017-12-11 07:34:04 +00:00
Søren Gjesse f93deb040d Merge "Enable R8 by default" 2017-12-11 07:29:06 +00:00
Simran Basi e0c7f76823 Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5 am: 5a8f82d4a1 am: 7b26faa5ea am: acaa4cc623 -s ours am: 203a1f407b -s ours am: f1be8db559 -s ours am: fd5769448d -s ours 
am: 15949b76ab  -s ours

Change-Id: If79b90b216e5697ed70a0db8ccd879c5c5884021
 2017-12-08 17:07:06 +00:00
Ryan Longair 0025fee6a0 resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9 am: 5cf66c7496 -s ours am: 3288f0cabb -s ours am: 7a5397dd65 -s ours am: 23aff09c6f -s ours 
am: 439cb46989  -s ours

Change-Id: Ic945e9ff226b1b2e5cc1cfab58de7fb90e11ba8c
 2017-12-08 17:05:35 +00:00
Jaegeuk Kim 6149ea8637 Merge "core, release: add sload.f2fs for otatools.zip" am: 10c9f5d9d3 am: a5a2f10d79 
am: cc1d0c982e

Change-Id: I6a40d04c8935627f75ccf13b467bc96e63bfb2ee
 2017-12-08 17:00:37 +00:00
Søren Gjesse 7fbc84686c Enable R8 by default 
Test: m -j PRODUCT-aosp_x86-userdebug
Test: Check that some .vdex files built have R8 generated code
Change-Id: I3c07cfce7db44fcc2e1bf99960da248558d4a686
 2017-12-08 14:00:21 +01:00
Simran Basi 15949b76ab Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5 am: 5a8f82d4a1 am: 7b26faa5ea am: acaa4cc623 -s ours am: 203a1f407b -s ours am: f1be8db559 -s ours 
am: fd5769448d  -s ours

Change-Id: I01dcd7af15ae5b9a144c7615ddbcb722437d681d
 2017-12-08 04:13:54 +00:00
Ryan Longair 439cb46989 resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9 am: 5cf66c7496 -s ours am: 3288f0cabb -s ours am: 7a5397dd65 -s ours 
am: 23aff09c6f  -s ours

Change-Id: Ic30a5d1a95ee3eeb1143ecfafba9d91fa43c1bf1
 2017-12-08 04:12:07 +00:00
Simran Basi fd5769448d Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. am: 0dd1fb9112 am: a749d6bdb5 am: 5a8f82d4a1 am: 7b26faa5ea am: acaa4cc623 -s ours am: 203a1f407b -s ours 
am: f1be8db559  -s ours

Change-Id: I6ca9821729b805d8d0b1a3555c9727b86a58c5bb
 2017-12-08 04:08:09 +00:00
Ryan Longair 23aff09c6f resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9 am: 5cf66c7496 -s ours am: 3288f0cabb -s ours 
am: 7a5397dd65  -s ours

Change-Id: I197aa79c91c786dc2751e071361374a35ab3e4e7
 2017-12-08 04:06:50 +00:00
Simran Basi 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  -s ours

Change-Id: Ia84379e5a5329bb5459fdf20942869919b5a891f
 2017-12-08 04:03:53 +00:00
Ryan Longair 7a5397dd65 resolve merge conflicts of e4f7788661 to nyc-dr1-dev am: 78f5ddb032 am: e53bed3f7d am: 73d1c9c6d9 am: 5cf66c7496 -s ours 
am: 3288f0cabb  -s ours

Change-Id: I838022c8e050a929371e0a3e3dd4d3207952ec22
 2017-12-08 04:01:45 +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
Jaegeuk Kim cc1d0c982e Merge "core, release: add sload.f2fs for otatools.zip" am: 10c9f5d9d3 
am: a5a2f10d79

Change-Id: Icbca3310a938e2c48d4e82c2dd1454fec2a05c92
 2017-12-08 01:13:43 +00:00
Jaegeuk Kim a5a2f10d79 Merge "core, release: add sload.f2fs for otatools.zip" 
am: 10c9f5d9d3

Change-Id: Ic0735affd801275c3c2f91535b8c5dfad7c75981
 2017-12-08 01:07:30 +00:00
Dan Shi a20b6aa331 Merge "Create artifacts to include the list of test configs" am: c6b28799e9 am: 00d3e58d1c 
am: aa9f05a409

Change-Id: Ieb9380ef416c897b07af7444152e547cfa03f688
 2017-12-08 01:04:46 +00:00
Elliott Hughes 7fe213507e Merge "Get off my lawn forever!" am: 68a6b90f6b am: de2b92aa6e 
am: 811e87ccbb

Change-Id: I5a9245ca12adb086071c63f302ddab8dc0a8f344
 2017-12-08 01:03:47 +00:00
Dan Shi 34f86d2623 Merge "Create an artifact to include the list of integrated tests in TradeFed" am: 3af39153a8 am: 477427a62c 
am: 0c76aa1f03

Change-Id: I0815b039c4fb06ed6d1f44b5b113b8ece71eed4a
 2017-12-08 01:02:33 +00:00
Elliott Hughes ef40ea28a6 Merge "Explain why BuildImage failed." am: 9a33b96103 am: 76eb8e10ee 
am: 20742517b4

Change-Id: Icee1c13e2dc8980ee697395b51e758c69e4b3cdf
 2017-12-08 01:01:26 +00:00
Colin Cross 1999b3b189 Merge changes Ia7feaa13,Ib917761e am: af3984d26d am: c11df9e038 
am: 3f74663fdf

Change-Id: I6768416136793ea26a87fde4368734a0e02e2a3f
 2017-12-08 01:00:12 +00:00
Dan Shi aa9f05a409 Merge "Create artifacts to include the list of test configs" am: c6b28799e9 
am: 00d3e58d1c

Change-Id: Ieba99654675f2c347f91f2ba0d41de970a86889c
 2017-12-08 00:58:12 +00:00
Jaegeuk Kim 10c9f5d9d3 Merge "core, release: add sload.f2fs for otatools.zip" 2017-12-08 00:57:42 +00:00
Dan Shi 00d3e58d1c Merge "Create artifacts to include the list of test configs" 
am: c6b28799e9

Change-Id: I595a5874c642c90e83a10ee5a360661e9c1e9390
 2017-12-08 00:47:56 +00:00
Treehugger Robot c6b28799e9 Merge "Create artifacts to include the list of test configs" 2017-12-08 00:43:20 +00:00
Bo Hu 557bc407f6 Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*"" am: 94ea878ae0 am: 079a9f64ac 
am: 71900fc787

Change-Id: I52161ad8547d17b313025f5b8ae0beb4ac406b25
 2017-12-08 00:40:10 +00:00
Colin Cross baae1f3054 Merge "Add java modules to soong_to_convert.txt" am: fedcf41cc3 am: 2ea0ecdbfe 
am: f2b5f371ff

Change-Id: I2598404303edb51e31aa45a864c657e08513ba29
 2017-12-08 00:30:39 +00:00
Xin Li 3682bc395e Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 5f03da0404 -s ours am: e0b934c66f 
am: 302b83fbc3  -s ours

Change-Id: I02a6bd910b35adb743ab01eae0ea5af6009a9459
 2017-12-08 00:29:41 +00:00
Elliott Hughes 811e87ccbb Merge "Get off my lawn forever!" am: 68a6b90f6b 
am: de2b92aa6e

Change-Id: I071b7894230330ef501b4bd932c8cf48e189de0b
 2017-12-07 23:53:07 +00:00
Elliott Hughes de2b92aa6e Merge "Get off my lawn forever!" 
am: 68a6b90f6b

Change-Id: I5a5ee5015fa598f8f43f09bf73cadb84ccf48746
 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)
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
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