Jaewoong Jung
f10cb18a20
Merge "Add additional_certificates to android_app_import." am: 05ebca4f7f
am: 6ea8f69bc5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622565
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ccbc3abbfad8807ca00f4fd27a23d975483f6b3
2021-03-09 15:44:34 +00:00
Lukács T. Berki
5d0562e33f
Merge "Remove the special-casing of /dev from test path normalization." am: 5037e09ca0
am: 5f0c2d1516
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1623762
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If01da8310052c492b67e9149a193fdf67ea1a32e
2021-03-09 15:43:47 +00:00
Jaewoong Jung
6ea8f69bc5
Merge "Add additional_certificates to android_app_import." am: 05ebca4f7f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622565
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9cee9e0ddc12a5bee313b47f5d01644aee513ca9
2021-03-09 15:10:37 +00:00
Lukács T. Berki
5f0c2d1516
Merge "Remove the special-casing of /dev from test path normalization." am: 5037e09ca0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1623762
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31ee9923f5e9850b51b0b46fc7bccf3a40aab3f2
2021-03-09 15:05:08 +00:00
Jaewoong Jung
05ebca4f7f
Merge "Add additional_certificates to android_app_import."
2021-03-09 14:55:24 +00:00
Lukács T. Berki
5037e09ca0
Merge "Remove the special-casing of /dev from test path normalization."
2021-03-09 14:32:51 +00:00
Lukács T. Berki
ee4d1474f4
Merge "Really fix queryview." am: 706cb6f344
am: 425d009fbd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622431
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia07d1f8500e4616125d1be721c6311c589806b21
2021-03-09 13:05:52 +00:00
Lukács T. Berki
425d009fbd
Merge "Really fix queryview." am: 706cb6f344
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1622431
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a7d012f0f51ec6784b25427841a6845888c3397
2021-03-09 12:36:50 +00:00
Treehugger Robot
f58582a3c1
Merge "Introduce derive_classpath service." am: c285125110
am: eb4bc50101
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I79df795b34714b5f12c2d34302096c40672ca1f5
2021-03-09 11:50:04 +00:00
Lukács T. Berki
706cb6f344
Merge "Really fix queryview."
2021-03-09 11:41:12 +00:00
Treehugger Robot
eb4bc50101
Merge "Introduce derive_classpath service." am: c285125110
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic56be91e09a0c7d45aa8ce46f88a25573d8b1854
2021-03-09 11:17:40 +00:00
Treehugger Robot
c285125110
Merge "Introduce derive_classpath service."
2021-03-09 10:23:49 +00:00
Ulyana Trafimovich
6afbccdbc8
Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." am: 35570c14ce
am: 3d7489c1e1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4bc1508470878ca1cdefe4978854642001d029ab
2021-03-09 10:06:19 +00:00
Lukacs T. Berki
c5723e3af7
Remove the special-casing of /dev from test path normalization.
...
Test: "m nothing"
Change-Id: Ib88f1632792dc9351bcf52dbe78822acf94fad27
2021-03-09 10:50:47 +01:00
Ulyana Trafimovich
3d7489c1e1
Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled." am: 35570c14ce
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1615200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4fc6627aa2d9c2a83c20200b40412373e73e8e8
2021-03-09 09:24:08 +00:00
Paul Duffin
747968514a
Merge "Store order of the components used by the tests" am: 40786119af
am: 32b88afec6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1623559
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I338473235d8ad2b194d1ac3fedc658c09aad3226
2021-03-09 09:05:31 +00:00
Ulyana Trafimovich
35570c14ce
Merge "Disable verify_uses_libraries check if dexpreopt is globally disabled."
2021-03-09 08:40:23 +00:00
Lukacs T. Berki
47a9d0cd98
Really fix queryview.
...
In addition, make the Ninja command nicer by using backticks instead of
backslash-quoting double quotes.
Test: Manual: "m queryview"
Change-Id: I5d6e1d41424e0229bfe08e2e7eaf2fb025ed48c2
2021-03-09 09:37:53 +01:00
Paul Duffin
32b88afec6
Merge "Store order of the components used by the tests" am: 40786119af
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1623559
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42f88adb291a2265d816dcce485f8e731d171704
2021-03-09 08:26:12 +00:00
Paul Duffin
40786119af
Merge "Store order of the components used by the tests"
2021-03-09 07:53:07 +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
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
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
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
Jaewoong Jung
25ae8dec91
Add additional_certificates to android_app_import.
...
Bug: 182175153
Test: app_import_test,go
Change-Id: I467e98065945b59dcc574a18144756edccdea441
2021-03-08 17:37:46 -08: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
f5de6684fd
Store order of the components used by the tests
...
Previously, the TestContext.Register() method stored all the components
that were available, rather than just the ones that were used by the
tests. That was practically useless for debugging. This change just
stores the ones used by the test.
Bug: 181953909
Test: m nothing
Change-Id: I8589b9b4423133709ab0cfd763bd284a7f47a24a
2021-03-09 01:34:41 +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
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