Paul Duffin
b364e7b212
Migrate from result methods to function Asserts am: e84b1338c5
am: 37e8d92321
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629626
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc29b11f1c98da73b996995a299c38c6e2eb40eb
2021-03-13 02:38:32 +00:00
Chris Wailes
4bf7f0db22
Add test suite to legacy core platform allowlist.
...
Test: atest DexManagerTests
Bug: 174783329
Merged-In: Ife2be3cbc15f06ae382c08c2d6a5c5962feb0caf
Change-Id: Ife2be3cbc15f06ae382c08c2d6a5c5962feb0caf
2021-03-12 14:57:26 -08:00
Paul Duffin
e84b1338c5
Migrate from result methods to function Asserts
...
Bug: 181070625
Test: m nothing
Change-Id: Iadb85270290acb52c55f2ad70c9f145f1c34b611
2021-03-12 22:24:51 +00:00
Jaewoong Jung
5151495607
Merge "Delete defaultsFactory in java.go." am: b37b009b16
am: 1e4e5172fa
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626340
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I299401c7deef410726a6d3e046da74d887548200
2021-03-12 19:49:26 +00:00
Jaewoong Jung
b37b009b16
Merge "Delete defaultsFactory in java.go."
2021-03-12 18:37:38 +00:00
Julien Desprez
ba380e444b
Merge "Remove the robolectric heuristic out of java_test" am: c001dc6d2f
am: fb44fbd6be
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624564
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1873f12d4c79f61f58f0784320bc05f8ff2b452
2021-03-12 16:51:42 +00:00
Julien Desprez
c001dc6d2f
Merge "Remove the robolectric heuristic out of java_test"
2021-03-12 15:40:19 +00:00
Paul Duffin
a84d532ae5
Merge "Convert testDexpreoptBoot to use test fixtures" am: a8c443618a
am: 34fc4cf2fb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629622
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f6eb23663c51bf0024d03c8ce739647cd778113
2021-03-12 13:04:31 +00:00
Remi NGUYEN VAN
c3c69e11bd
Revert "Revert "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
Change-Id: Ibf7b6e895cc1c66b0fec12ca9ee2f6cb6849a93c
Test: m checkbuild
Merged-In: Ieddaf859f568bc8ee486692474a4dec48b3d25e6
2021-03-12 12:04:18 +00:00
Remi NGUYEN VAN
d183965617
Merge "Revert "Reinstate the enforcement of stable core platform API usage"" into rvc-qpr-dev-plus-aosp
2021-03-12 12:03:39 +00:00
Remi NGUYEN VAN
db378c5511
Add secureprocessor to the legacy core platform API list
...
The build target uses non-stable APIs such as
dalvik.system.CloseGuard.
Merged-In: Ieddaf859f568bc8ee486692474a4dec48b3d25e6
Change-Id: I7643e6c7febd44509ac819134de91bca88e2d257
2021-03-12 10:44:39 +00:00
Remi NGUYEN VAN
8c12d89bed
Revert "Reinstate the enforcement of stable core platform API usage"
...
This reverts commit b528ed5fae
.
Reason for revert: Breaks bramble build, b/182544394
Merged-In: Ieddaf859f568bc8ee486692474a4dec48b3d25e6
Change-Id: Iaf8f80f4b6f70da8d6e45a2619953534f87ea03b
2021-03-12 10:16:52 +00:00
Paul Duffin
2b2582abf0
Merge "Add prebuilt_boot_image and add boot_images to sdk" am: 32a8aadfaa
am: 7b1c7dc98f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626501
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0ee0f2947181bb5c28bf543246e8c713aa0beae5
2021-03-12 09:02:51 +00:00
Paul Duffin
14cb8dd965
Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths" am: c7cdd1513c
am: 83eb3ba314
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628682
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I68b75a9b92cf966ddfc1cfdfff746259164d74b4
2021-03-12 09:02:32 +00:00
Paul Duffin
451aeef583
Convert testDexpreoptBoot to use test fixtures
...
Bug: 181070625
Test: m nothing
Change-Id: Iaca15c87c68383630aed015e0e17adad3c37c4b1
2021-03-12 09:02:13 +00:00
Paul Duffin
32a8aadfaa
Merge "Add prebuilt_boot_image and add boot_images to sdk"
2021-03-12 08:06:45 +00:00
Paul Duffin
c7cdd1513c
Merge "Improve name of getModuleHeaderJarsAsNormalizedPaths"
2021-03-12 07:59:39 +00:00
Daulet Zhanguzin
b528ed5fae
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
(cherry picked from commit 6fb6cffce2
)
2021-03-12 05:06:48 +00:00
Julien Desprez
3f4e7a10a6
Remove the robolectric heuristic out of java_test
...
Test: presubmit
Bug: 180736967
Change-Id: I65193d1639088149d8c2f1d5b7d4311e9f69a609
2021-03-12 03:41:21 +00:00
Treehugger Robot
76084edf9b
Merge changes I0ad54aa7,I1d6d20ec am: d13e31a8cc
am: bb80dcb022
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627540
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85d88f246d77e2a125444e84d309aae16dc9acfd
2021-03-12 02:29:40 +00:00
Treehugger Robot
d13e31a8cc
Merge changes I0ad54aa7,I1d6d20ec
...
* changes:
Propagate LANG environment variable to lint in RBE
Default lint RBE to local exec strategy
2021-03-12 01:11:49 +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
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
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
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
Paul Duffin
df0b483089
Merge "Convert system modules tests to use fixtures" am: 6f688d03c8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628001
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I72ab39aa93ad79fd53f97ca3b3eb08ea327451e8
2021-03-11 15:21:42 +00:00
Paul Duffin
7c05abc397
Merge "Separate system modules tests into their own file" am: 8075291a94
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I629d3459f4c2467233baadd891d6e11630900208
2021-03-11 15:21:32 +00:00
Paul Duffin
08e8a82ebb
Merge "prebuilt_apis should create a java_system_modules_import" am: f18ff339a9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626518
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I920b5d2496f956ac41ba6a631c848445d7c36ffb
2021-03-11 15:21:18 +00:00
Jaewoong Jung
4bc4800ce7
Merge "Populate baseline_file values." am: 48b8df14be
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624707
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia3586bc9e7bc9f8e31ec98c3fb021f3ad1f7d7cc
2021-03-11 15:20:56 +00:00
Paul Duffin
6f688d03c8
Merge "Convert system modules tests to use fixtures"
2021-03-11 15:11:20 +00:00
Paul Duffin
8075291a94
Merge "Separate system modules tests into their own file"
2021-03-11 15:10:54 +00:00
Paul Duffin
f18ff339a9
Merge "prebuilt_apis should create a java_system_modules_import"
2021-03-11 15:09:47 +00:00
Jaewoong Jung
48b8df14be
Merge "Populate baseline_file values."
2021-03-11 15:04:52 +00:00
Paul Duffin
4f0a75abde
Ensure java_system_modules_import uses prebuilts
...
Make sure that java_system_modules_import always depends on the
prebuilt by adding dependencies in the ComponentDepsMutator() method
which is called before prebuilts without a corresponding source are
renamed from prebuilt_<x> to <x>. That requires the prebuilt_ prefix
to be provided but it ensures that the dependencies are safe.
Similar logic also makes sure java_system_modules always depends on
the source module and not on a renamed prebuilt module.
Bug: 182402568
Test: m nothing
Change-Id: I30db95978f5d9b205951011edf40585ee36c0c4c
2021-03-11 09:40:02 +00:00
Paul Duffin
c52bea9555
Improve system modules tests
...
The previous approach of looking for substrings in the command that
matched the base name of the jar could not differentiate between
whether the jar was a prebuilt or a source as they both have the same
base name.
The tests also did not cover the case when there was both prebuilts
and source modules.
This change:
1. Checks that the inputs to the command come from the appropriate
module.
2. Adds a mixed test.
3. Deduped the source and prebuilt module definitions.
The new test reveals the buggy behavior which will be fixed in a follow
up change.
Bug: 182402568
Test: m nothing
Change-Id: I384ecca097cbe3560e7589c23fb99c176a42fd9b
2021-03-11 09:39:18 +00:00
Paul Duffin
f23e346f6c
Convert system modules tests to use fixtures
...
Bug: 182402568
Test: m nothing
Change-Id: I0535e60a692925b141e465d8e1ec92be21d54c88
2021-03-11 08:32:01 +00:00
Paul Duffin
db284be913
Separate system modules tests into their own file
...
java_test.go is getting too big.
Bug: 182402568
Test: m nothing
Change-Id: I9c3818f1d747a230fcb66687319a3a14d557a57c
2021-03-11 08:21:49 +00:00
Paul Duffin
d6c2a65211
prebuilt_apis should create a java_system_modules_import
...
Previously it was creating a java_system_modules which worked fine
because apart from the prebuilt nature the two are functionally
identical. However a follow up change will differentiate between them
which would break this code.
Bug: 182402568
Test: m nothing
Change-Id: Ifc13ce31235494e338d730c61a99d8887c5a2c5b
2021-03-11 08:01:19 +00:00
Paul Duffin
f7f65dafb4
Add prebuilt_boot_image and add boot_images to sdk
...
Bug: 177892522
Test: m nothing
Change-Id: I640359acd6840507f32d7034c97d4d1c7ff591e9
2021-03-11 07:24:26 +00:00
Jaewoong Jung
4bd1fc1763
Merge "Lineage properties support module references." am: 6df5e0307d
am: c3df3c5396
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625101
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8541e1e2aa1e9866e7616167f3305e2cd9c53419
2021-03-11 02:19:57 +00:00
Colin Cross
72241f12c0
Merge "Add comment to lintPaths" am: 42e49979f2
am: 8aac2c3dd5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624661
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib48bcb25eb1b6eb49ace54675e9eab42300e103c
2021-03-11 02:19:00 +00:00
Colin Cross
9c78cb83d0
Propagate LANG environment variable to lint in RBE
...
Without LANG, lint's text output is ASCII instead of UTF-8, causing
differences between local and remote execution.
Bug: 181681346
Bug: 182415460
Test: m USE_RBE=true RBE_LINT=true
Change-Id: I0ad54aa731582c9b54abb80f50ba508c75992b91
2021-03-10 18:03:05 -08:00