Paul Duffin
b6a5064630
Merge "Add text fixture preparers for rust package"
2021-03-11 21:53:07 +00:00
TreeHugger Robot
916bfe4dfa
[automerger skipped] Merge "Reinstate the enforcement of stable core platform API usage" into stage-aosp-master am: ae32526698
-s ours am: 7fc6b6f7d7
-s ours
...
am skip reason: Change-Id Ieddaf859f568bc8ee486692474a4dec48b3d25e6 with SHA-1 eaadd67a99
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13840799
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0394111cacd3a62f9ae6c447d811eb21790c715
2021-03-11 21:24:53 +00:00
TreeHugger Robot
7fc6b6f7d7
[automerger skipped] Merge "Reinstate the enforcement of stable core platform API usage" into stage-aosp-master am: ae32526698
-s ours
...
am skip reason: Change-Id Ieddaf859f568bc8ee486692474a4dec48b3d25e6 with SHA-1 eaadd67a99
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/13840799
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib02dd5b0151cdcd6abc296afd7887925b2c9cd71
2021-03-11 20:46:05 +00:00
TreeHugger Robot
ae32526698
Merge "Reinstate the enforcement of stable core platform API usage" into stage-aosp-master
2021-03-11 20:03:46 +00:00
Paul Duffin
6e9a4007b5
Prevent mock filesystem files being overridden by accident
...
Bug: 181070625
Test: m nothing
Change-Id: Ib12b5cbe9af980706620d7d7d85bcfe31f36b07f
2021-03-11 19:21:12 +00:00
Paul Duffin
c32c7c3042
Merge "Add preparer for test to allow missing dependencies" am: d1fc19be39
am: 840581bd45
am: c84e0c388b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d66e856cdf9c7eacf126ea73626afa823ec8536
2021-03-11 19:12:06 +00:00
Paul Duffin
ed43b1844a
Merge "Correct error in documentation of AssertDeepEquals" am: 6872d651b6
am: a073463fb6
am: bde5643a12
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628681
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I65127b0e6b40b5b997fb3e6147fd1778c6e7c34a
2021-03-11 19:12:00 +00:00
Paul Duffin
28bf9ee2b6
Merge "Switch CheckSnapshot from a testSdkResult method to a function" am: 982c550855
am: 8337c02b38
am: 05bdc8f744
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628640
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b1226a61da26ef5fc2f94c38b0d8ccabf2c248c
2021-03-11 19:11:54 +00:00
Paul Duffin
439451c5f7
Merge "Make testSdkResult compatible with android.TestResult" am: 4cd3d05a0c
am: d87a5255a1
am: 4d8205b84b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic4e3ed1b3caef936a8ca0ba45c18843e49e482ec
2021-03-11 19:11:45 +00:00
Paul Duffin
c84e0c388b
Merge "Add preparer for test to allow missing dependencies" am: d1fc19be39
am: 840581bd45
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I44ffa8d67af7e3a3fd8e5ccaf7c67c0ddaab0aac
2021-03-11 18:29:43 +00:00
Paul Duffin
bde5643a12
Merge "Correct error in documentation of AssertDeepEquals" am: 6872d651b6
am: a073463fb6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628681
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib3aa1db53d15c58f30af7c6d58ee889bf0d1711c
2021-03-11 18:29:37 +00:00
Paul Duffin
05bdc8f744
Merge "Switch CheckSnapshot from a testSdkResult method to a function" am: 982c550855
am: 8337c02b38
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628640
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I646103b44c4c86afb074932cf44e918c0045be4e
2021-03-11 18:29:32 +00:00
Paul Duffin
4d8205b84b
Merge "Make testSdkResult compatible with android.TestResult" am: 4cd3d05a0c
am: d87a5255a1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb546f8ae24f3bf02233eee44ee313d7061eca42
2021-03-11 18:29:25 +00:00
Daulet Zhanguzin
6fb6cffce2
Reinstate the enforcement of stable core platform API usage
...
It appears as though change I3a39be5f0b8736de4822c6a14072c78d4e4ad89d
accidentally stopped enforcing the use of the stable core platform
API in AOSP when the changes from rvc-dev-plus-aosp-without-vendor were
merged in.
Unfortunately, since then some additional usages of legacy core
platform APIs have crept in so this adds the affected modules to the
list of modules allowed to use the legacy core platform APIs.
Bug: 180399951
Test: m checkbuild
Merged-In: Ieddaf859f568bc8ee486692474a4dec48b3d25e6
Change-Id: Iacbee67fa103279a9823bd26c559821b04849be6
2021-03-11 18:23:47 +00:00
Artur Satayev
533b98cde3
Don't track modules that are only available to APEXes.
...
Modules that are not available for platform are developed with
updatability in mind, and do not require manual approvals.
Bug: 181223240
Test: checkbuild
Change-Id: I10b91053b3ef5a9ff5400d9d7a68fae3144a671c
2021-03-11 18:13:18 +00:00
Paul Duffin
840581bd45
Merge "Add preparer for test to allow missing dependencies" am: d1fc19be39
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4334fb39d1e7e0d749747c7a1b9d146ddd75031
2021-03-11 17:54:04 +00:00
Paul Duffin
a073463fb6
Merge "Correct error in documentation of AssertDeepEquals" am: 6872d651b6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628681
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id8808bb8b702204c8ab83d184a1978ca23e13174
2021-03-11 17:53:54 +00:00
Paul Duffin
8337c02b38
Merge "Switch CheckSnapshot from a testSdkResult method to a function" am: 982c550855
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628640
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42cc27f727be41ac6595acc6c8abd4251450d0d0
2021-03-11 17:53:46 +00:00
Paul Duffin
d87a5255a1
Merge "Make testSdkResult compatible with android.TestResult" am: 4cd3d05a0c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628639
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I981574af0b0cbbc899e2018ffca13b4730672f9b
2021-03-11 17:53:14 +00:00
Paul Duffin
fe9a9e3f7d
Add missing // to clarify comment
...
Bug: 181070625
Test: m nothing
Change-Id: Ia22a1be7a05b3a9efd34f2bf70216eb046396be0
2021-03-11 17:41:01 +00:00
Paul Duffin
214dcbbc77
Merge "Ensure java_system_modules_import uses prebuilts" am: fc9c218e83
am: 5b58ea07dd
am: 999d00098d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5cb81d9cc34b6cd4e73f49d54cf4f4a86f871ea5
2021-03-11 17:38:15 +00:00
Paul Duffin
1d4b35b6c8
Merge "Improve system modules tests" am: a2fcd19aef
am: 5afefecf0e
am: a2b0fc68e8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628002
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I173dcc684b9601b286d063181789abb003a91f89
2021-03-11 17:37:28 +00:00
Paul Duffin
4a2a29ce6a
Support test fixtures in sdk package
...
Bug: 181070625
Test: m nothing
Change-Id: Ifc96992e54c1b1d89a82b88ab27e555ae267a51e
2021-03-11 17:25:29 +00:00
Paul Duffin
db4888966a
Add text fixture preparers for rust package
...
Needed to decouple the integration of test fixtures into apex from the
support of test fixtures in rust tests.
Bug: 181070625
Test: m nothing
Change-Id: I26bdfde58dd75713ece89e631edabf041d40596a
2021-03-11 17:25:29 +00:00
Paul Duffin
37aad60507
Add apexFixtureFactory to apex package
...
Unlike the similar changes in other packages this change separates the
addition of the fixture factory and the conversion of the test...
methods to use them as there are a few tests that need converting to
use test fixtures first.
Bug: 181070625
Test: m nothing
Change-Id: Ic76523ba89fc1967631aeb682935935b5af116df
2021-03-11 17:25:29 +00:00
Paul Duffin
d1fc19be39
Merge "Add preparer for test to allow missing dependencies"
2021-03-11 17:24:15 +00:00
Paul Duffin
6872d651b6
Merge "Correct error in documentation of AssertDeepEquals"
2021-03-11 17:23:55 +00:00
Paul Duffin
982c550855
Merge "Switch CheckSnapshot from a testSdkResult method to a function"
2021-03-11 17:18:10 +00:00
Paul Duffin
4cd3d05a0c
Merge "Make testSdkResult compatible with android.TestResult"
2021-03-11 17:17:29 +00:00
Paul Duffin
999d00098d
Merge "Ensure java_system_modules_import uses prebuilts" am: fc9c218e83
am: 5b58ea07dd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4645b4ed61b55c80efaf272ef9af5fd1e8339160
2021-03-11 16:57:02 +00:00
Paul Duffin
a2b0fc68e8
Merge "Improve system modules tests" am: a2fcd19aef
am: 5afefecf0e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628002
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d6a6cb9697c408a1dcb2b71b20b766141624020
2021-03-11 16:56:48 +00:00
Artur Satayev
182c96ccb5
Merge "Introduce derive_classpath service." into sc-dev
2021-03-11 16:25:20 +00:00
Paul Duffin
5b58ea07dd
Merge "Ensure java_system_modules_import uses prebuilts" am: fc9c218e83
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0add314d0582d2bdf9079a1c3e992f8fe0ad8127
2021-03-11 16:17:54 +00:00
Paul Duffin
5afefecf0e
Merge "Improve system modules tests" am: a2fcd19aef
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628002
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie69ddc34efca822bd9a7cd49cad93d6b0831242a
2021-03-11 16:17:21 +00:00
Paul Duffin
4e99ef761a
Improve name of getModuleHeaderJarsAsNormalizedPaths
...
Bug: 182402568
Test: m nothing
Change-Id: I93bfe10f0ac62bf018cfee6738fa080d9404b1cb
2021-03-11 15:53:25 +00:00
Paul Duffin
fc9c218e83
Merge "Ensure java_system_modules_import uses prebuilts"
2021-03-11 15:50:58 +00:00
Paul Duffin
a2fcd19aef
Merge "Improve system modules tests"
2021-03-11 15:50:34 +00:00
Christopher Parsons
3a642e2800
Merge "mixed builds for cc_static_library without deps" am: 2bed9ffaf4
am: a86985e40a
am: 3cb7e6bd83
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625068
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iddbc0f04dec0faeb70f5ccfe694dd3deaa65cb61
2021-03-11 15:46:38 +00:00
Paul Duffin
f270882173
Merge "Convert system modules tests to use fixtures" am: 6f688d03c8
am: df0b483089
am: fea2bed0f8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11eb84903c7394cbc5b5e774e1c64bd3f355e80c
2021-03-11 15:46:30 +00:00
Paul Duffin
d4831e4d8a
Merge "Separate system modules tests into their own file" am: 8075291a94
am: 7c05abc397
am: 044abfd9a1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I802acaf6b80b1190750abbdd96c0d161ae3a4e07
2021-03-11 15:46:22 +00:00
Paul Duffin
3a7399b7d2
Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9
am: 08e8a82ebb
am: 2543e840af
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I20b4649e39812b1e53bafe3ba13179823afb5dfc
2021-03-11 15:46:14 +00:00
Jaewoong Jung
8faade67a4
Merge "Populate baseline_file values." am: 48b8df14be
am: 4bc4800ce7
am: 41dea7a344
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ca117224b92585601b2a542f98ee2a776c4895c
2021-03-11 15:46:02 +00:00
Paul Duffin
a998e9806a
Merge "Add preparer for test with variables" am: 8c004c6c04
am: c371cbb33d
am: cc285a8253
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626512
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46946e1448cf6e83399e46c259e8fba9e6744817
2021-03-11 15:45:20 +00:00
Paul Duffin
3e72530cea
Merge "Add AssertStringListContains to TestHelper" am: 01c76ca278
am: f2def2fc4e
am: 8bbbff16d9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cee161a60b865370a60b0ab2a6f9a431b9d8497
2021-03-11 15:45:13 +00:00
Paul Duffin
73bfe21a62
Merge "Convert fuchsia tests to use test fixtures" am: 4e1916011c
am: 3dbfef078e
am: 9225cc2bf9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626509
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1b047130460625a91c636c8e2aa516bcbbf35f3
2021-03-11 15:45:03 +00:00
Christopher Parsons
3cb7e6bd83
Merge "mixed builds for cc_static_library without deps" am: 2bed9ffaf4
am: a86985e40a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625068
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I37ccb81a8a558a37119a3bebc302327c39781729
2021-03-11 15:41:47 +00:00
Paul Duffin
fea2bed0f8
Merge "Convert system modules tests to use fixtures" am: 6f688d03c8
am: df0b483089
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4aebc9e5b74c373a6072286a454ed721e53be7f
2021-03-11 15:41:41 +00:00
Paul Duffin
044abfd9a1
Merge "Separate system modules tests into their own file" am: 8075291a94
am: 7c05abc397
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a4bff6fc543c1c378a834fb9a615c6689216859
2021-03-11 15:41:32 +00:00
Paul Duffin
2543e840af
Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9
am: 08e8a82ebb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5228bb68a51f01cf94019f04ad89178220bb9095
2021-03-11 15:41:27 +00:00
Jaewoong Jung
41dea7a344
Merge "Populate baseline_file values." am: 48b8df14be
am: 4bc4800ce7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00cc4e320a9013689b7ef5e0f253379df8935d1b
2021-03-11 15:41:14 +00:00