openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
38,602 Commits 2 Branches 1 Tag 34 MiB
Commit Graph

38602 Commits

Author SHA1 Message Date
TreeHugger Robot f053d84257 Merge "update apex/allowed_deps.txt" into sc-dev 2021-03-09 07:14:19 +00:00
Alexander Smundak 5819e1fe5d Merge "Workaround for b/182183061: generate corpus-specific rule file" am: 0fa5f78714 am: 8035a392ab am: 96e20dff8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id04f4bb4f757e5b614d0b6c14d1cdc3cab10bb06
 2021-03-09 06:14:34 +00:00
Alexander Smundak 96e20dff8d Merge "Workaround for b/182183061: generate corpus-specific rule file" am: 0fa5f78714 am: 8035a392ab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ff13b6cefb024bd1782e03d365f535aed086316
 2021-03-09 05:31:19 +00:00
Paul Duffin 4904e3891c Merge "Avoid accidentally sharing preparers slice across factories" am: 7160699044 am: 500b20e843 am: 22fa32403a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife50ee5625dac82ea9162d492f05ab91a6172aff
 2021-03-09 04:53:09 +00:00
Alexander Smundak 8035a392ab Merge "Workaround for b/182183061: generate corpus-specific rule file" am: 0fa5f78714 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0534a3451c427db7de044359995f2b1313e2d4a4
 2021-03-09 04:48:18 +00:00
Paul Duffin 22fa32403a Merge "Avoid accidentally sharing preparers slice across factories" am: 7160699044 am: 500b20e843 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcfdf52a239dd9a4a1591cf2a9980a0db87a11e3
 2021-03-09 04:08:44 +00:00
Alexander Smundak 0fa5f78714 Merge "Workaround for b/182183061: generate corpus-specific rule file" 2021-03-09 04:02:09 +00:00
Jiyong Park 914382940f Merge "sysprop_library correctly supports apex_available and min_sdk_version" am: acb7aeb9a8 am: ef2ea5b20e am: eb5562ae54 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2841301727d6b0803c1252e304ea5b91ed99839
 2021-03-09 03:28:43 +00:00
Paul Duffin 43dfd3650e Merge "Ensure test/runtime order of singletons/pre-singletons is consistent" am: 062d9338d1 am: 9f9233eec6 am: ebb5c41491 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib28aa00bf28147157384b043a496f7ba2722f367
 2021-03-09 03:28:36 +00:00
Treehugger Robot 39321c3409 Merge changes I22f90c90,I2d965212,Ib7d421f5 am: 2034187aa5 am: 4065c4474a am: 4b0f875739 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1b3477b1f21c0e725397a2d01bbe775dd02dfe7
 2021-03-09 03:28:00 +00:00
Paul Duffin 500b20e843 Merge "Avoid accidentally sharing preparers slice across factories" am: 7160699044 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6942f827c8a636745a76e62987cb0ba4e1df5698
 2021-03-09 03:25:36 +00:00
Paul Duffin 7160699044 Merge "Avoid accidentally sharing preparers slice across factories" 2021-03-09 02:42:19 +00:00
Artur Satayev cdf605f787 [automerger skipped] Introduce derive_classpath service. am: ce06cc0c25 -s ours 
am skip reason: Change-Id If0a3cb00754834133abea12caff3fdc5b7cff696 with SHA-1 92f7874e82 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13756805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8ca0a79649a41e119e15ee8683e8f8f2e1b5634
 2021-03-09 02:40:57 +00:00
Jiyong Park eb5562ae54 Merge "sysprop_library correctly supports apex_available and min_sdk_version" am: acb7aeb9a8 am: ef2ea5b20e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic22bce91aa1ff73283d7b2107375c8f099f81f46
 2021-03-09 02:37:52 +00:00
Paul Duffin ebb5c41491 Merge "Ensure test/runtime order of singletons/pre-singletons is consistent" am: 062d9338d1 am: 9f9233eec6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bacfbbdff9b1b0c9c4a2da6b4f2e25ac728a112
 2021-03-09 02:37:47 +00:00
Treehugger Robot 4b0f875739 Merge changes I22f90c90,I2d965212,Ib7d421f5 am: 2034187aa5 am: 4065c4474a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a002676147fd5afb6ee619e33818f04f8581840
 2021-03-09 02:37:25 +00:00
Jiyong Park ef2ea5b20e Merge "sysprop_library correctly supports apex_available and min_sdk_version" am: acb7aeb9a8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79234605bcf8518935ccfcd0aaea2779df93c7a8
 2021-03-09 01:57:51 +00:00
Paul Duffin 9f9233eec6 Merge "Ensure test/runtime order of singletons/pre-singletons is consistent" am: 062d9338d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622504

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib44998a6b729b73c5eb03b07eb58aafa5db935bc
 2021-03-09 01:57:41 +00:00
Treehugger Robot 4065c4474a Merge changes I22f90c90,I2d965212,Ib7d421f5 am: 2034187aa5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc48ab22f7bc82ee306e58f836a364f3e0caa581
 2021-03-09 01:56:01 +00:00
Jiyong Park acb7aeb9a8 Merge "sysprop_library correctly supports apex_available and min_sdk_version" 2021-03-09 01:37:32 +00:00
Paul Duffin 062d9338d1 Merge "Ensure test/runtime order of singletons/pre-singletons is consistent" 2021-03-09 01:34:07 +00:00
Treehugger Robot 2034187aa5 Merge changes I22f90c90,I2d965212,Ib7d421f5 
* changes:
  Separate the collation of singletons from registration
  Defer registration of singletons and pre-singletons in TestContext
  Ensure mutators used in tests are in the same order as at runtime
 2021-03-09 01:20:37 +00:00
Sasha Smundak 7049266392 Workaround for b/182183061: generate corpus-specific rule file 
Bug: 182183061
Test: run build_kzip.bash, verify Go compilation units have corpus set
Change-Id: I26e034eb9bbb8fbb3902404ce72f7e223b9a5972
 2021-03-08 16:29:31 -08:00
Artur Satayev ce06cc0c25 Introduce derive_classpath service. 
go/updatable-classpath

Bug: 180105615
Test: manual + boot test
Change-Id: If0a3cb00754834133abea12caff3fdc5b7cff696
Merged-In: If0a3cb00754834133abea12caff3fdc5b7cff696
 2021-03-09 00:11:13 +00:00
TreeHugger Robot 2970f7ea17 Merge "Introduce derive_classpath service." into sc-dev 2021-03-09 00:00:51 +00:00
Colin Cross f534923470 Merge "Fix nested properties in soong config structs" am: 6950702b93 am: d9880cc402 am: dbf16d4dd6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5904499e0a30e844fdd9f4ea13ab71dc3e718f96
 2021-03-08 23:25:01 +00:00
Paul Duffin 35cb76e4d1 Merge "Separate the collation of mutators from registration" am: 5a5eeace54 am: e639ceae03 am: 0d2f80a8d8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a10f307171c7b3f7f1022261e297f885bc0bcd0
 2021-03-08 23:24:55 +00:00
Paul Duffin 34e6151cd7 Merge "Add sortableComponent abstraction" am: 4160a071d6 am: 049cfd09f4 am: 5557e4783b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcbe9d0fa95d2cbba6a9212607c6ae4eb507b52b
 2021-03-08 23:24:10 +00:00
Colin Cross dbf16d4dd6 Merge "Fix nested properties in soong config structs" am: 6950702b93 am: d9880cc402 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I690fce655115f8163e1b717a36d7008a8c4ceeeb
 2021-03-08 22:59:28 +00:00
Paul Duffin 0d2f80a8d8 Merge "Separate the collation of mutators from registration" am: 5a5eeace54 am: e639ceae03 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I536a119cf7079ac91266aeacf264e526161d2983
 2021-03-08 22:59:22 +00:00
Paul Duffin 5557e4783b Merge "Add sortableComponent abstraction" am: 4160a071d6 am: 049cfd09f4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6140a8a34836bfb8bddfce6732a78d1069bb56ed
 2021-03-08 22:58:13 +00:00
Paul Duffin fa29885380 Avoid accidentally sharing preparers slice across factories 
Previously, there was a bug that caused tests which ran successfully on
their own to fail when run together in parallel. They each extended the
same factory and ended up sharing the preparers slice which meant that
they overwrote each other's preparers causing the tests to fail.

This change fixes that by creating a new slice for each factory.

Bug: 181070625
Test: m nothing
Change-Id: If340c125c5b03a9d5c36a59ff4da4ec189808f9b
 2021-03-08 22:45:09 +00:00
Paul Duffin 41d77c76ae Ensure test/runtime order of singletons/pre-singletons is consistent 
Bug: 181953909
Test: m nothing
Change-Id: I77e0106ceb04b44b6559630f4a8a510f1a66378b
 2021-03-08 22:40:32 +00:00
Paul Duffin 42d0b93177 Separate the collation of singletons from registration 
That is to allow the order in which singletons are registered at
runtime, including the ones added by default, to be used to define the
order in which singletons must be registered in tests.

Bug: 181953909
Test: m nothing
Change-Id: I22f90c90100a8d52a572d4451a1a5d256784b57a
 2021-03-08 22:40:32 +00:00
Paul Duffin d182fb3907 Defer registration of singletons and pre-singletons in TestContext 
In preparation for allowing the TestContext to enforce an ordering on
the registration of singletons and pre-singletons in the same way as it
does for mutators this defers the registration of them into the
underlying Context.

Bug: 181953909
Test: m nothing
Change-Id: I2d9652122bb6387b6b47ca4761e811885d15c2b6
 2021-03-08 22:40:25 +00:00
Paul Duffin 281deb2c6e Ensure mutators used in tests are in the same order as at runtime 
This change uses the order in which mutators are registered at runtime
to define the order in which mutators must be registered in tests to
improve test reliability and prevent issues like bug 181974714.

Generally, it simply sorts the test mutators into the same order as
used at runtime. However, if the test includes a mutator that is not
used at runtime then it cannot sort them because it does not have
enough information to know where it should appear in that order. So,
instead it simply checks the order and makes sure that it matches.

Allowing relationships between mutators to be explicitly defined, e.g.
mutator X should come after mutator Y but before mutator A would fix
that information gap and allow them to be sorted but that is outside
the scope of this piece of work.

The code here is written generically for a sortableComponent as
follow up changes will sort singletons and pre-singletons in the same
way.

Bug: 181953909
Test: m nothing
Change-Id: Ib7d421f578e25f6dccaaff4f73b69838d1b54b00
 2021-03-08 22:24:11 +00:00
Colin Cross d9880cc402 Merge "Fix nested properties in soong config structs" am: 6950702b93 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621921

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5b5f7b51dc90d5fc05d98f73b5cbe44a6c9e702
 2021-03-08 22:20:27 +00:00
Paul Duffin e639ceae03 Merge "Separate the collation of mutators from registration" am: 5a5eeace54 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I340ff3cd1527b557fd32b0e5a424fe5f41f3517a
 2021-03-08 22:20:18 +00:00
Paul Duffin 049cfd09f4 Merge "Add sortableComponent abstraction" am: 4160a071d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622499

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50766f00403249ae3c506bdbbda86e85150e8dc1
 2021-03-08 22:19:32 +00:00
Colin Cross 6950702b93 Merge "Fix nested properties in soong config structs" 2021-03-08 22:12:56 +00:00
Paul Duffin 5a5eeace54 Merge "Separate the collation of mutators from registration" 2021-03-08 21:44:10 +00:00
Paul Duffin 4160a071d6 Merge "Add sortableComponent abstraction" 2021-03-08 21:43:54 +00:00
Colin Cross 7b6db9b717 Merge "Support robolectric prebuilts in android_robolectric_test" am: 7314fedd37 am: d5e78d1c17 am: 6426ae5a73 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ac0e29ee43926bf07ba918a477dbef1389f643c
 2021-03-08 20:15:13 +00:00
Colin Cross cbd14768a4 Merge "Remove extra return value from testApex" am: 110bca5bd1 am: f686c21c3b am: bbf3dcf9ec 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e904bf0966fcf1f402daeba5b79486d725c5b35
 2021-03-08 20:15:03 +00:00
Colin Cross 6426ae5a73 Merge "Support robolectric prebuilts in android_robolectric_test" am: 7314fedd37 am: d5e78d1c17 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c3d6e50e5c3968da29ed1f88198a5545aef0ee9
 2021-03-08 20:09:31 +00:00
Colin Cross d5e78d1c17 Merge "Support robolectric prebuilts in android_robolectric_test" am: 7314fedd37 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1621781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97b8e40d66a800cdb19a3d5e29a51db13d817e9c
 2021-03-08 19:48:45 +00:00
Colin Cross bbf3dcf9ec Merge "Remove extra return value from testApex" am: 110bca5bd1 am: f686c21c3b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3887d404da1c6be15e591ecc389cab72826bef5
 2021-03-08 19:28:35 +00:00
Colin Cross 7314fedd37 Merge "Support robolectric prebuilts in android_robolectric_test" 2021-03-08 19:08:10 +00:00
Colin Cross f686c21c3b Merge "Remove extra return value from testApex" am: 110bca5bd1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1590978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3a27132b2c45fe2f71546c33e334abdf292994b
 2021-03-08 18:43:03 +00:00
Colin Cross 110bca5bd1 Merge "Remove extra return value from testApex" 2021-03-08 18:16:23 +00:00