Commit Graph

39111 Commits

Author SHA1 Message Date
Jiyong Park d279ff2313 Merge "bootimg supports v4 header" am: ca5e611e0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I181f611d99ed10d101544174885dc7b015a139ea
2021-03-15 14:49:32 +00:00
Treehugger Robot 3942324565 Merge "Add a way to remove duplicates from Bazel label lists, to e.g. avoid duplicate deps." am: 07d73efa2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id25d40c4510897675ed13a4ac807d05d585aa7fe
2021-03-15 14:48:45 +00:00
Jiyong Park ca5e611e0a Merge "bootimg supports v4 header" 2021-03-15 14:39:07 +00:00
Treehugger Robot 07d73efa2d Merge "Add a way to remove duplicates from Bazel label lists, to e.g. avoid duplicate deps." 2021-03-15 14:12:39 +00:00
satayev b5c1a74f5d Merge "Don't track modules that are only available to APEXes." am: 2338d6f6e4 am: ebfe02a781 am: 13c655bf29
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628693

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8794765359558cfee7c9d1cb2ef74674a244f283
2021-03-15 14:11:23 +00:00
Thiébaud Weksteen 2df53395d0 Merge "Export OUT_DIR variable to rust-project.json" am: e5eb33b634 am: c634756619 am: 51e3138c23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1608134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4af74cfae0046b947904b7beeee228b2aacb28e
2021-03-15 14:11:11 +00:00
satayev 13c655bf29 Merge "Don't track modules that are only available to APEXes." am: 2338d6f6e4 am: ebfe02a781
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628693

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I468324eaa0ed012feba41cbf99809c8bd6ea397c
2021-03-15 13:28:54 +00:00
Thiébaud Weksteen 51e3138c23 Merge "Export OUT_DIR variable to rust-project.json" am: e5eb33b634 am: c634756619
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1608134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie35bd6e25ce4a42b14046f5f5deff67f502d63aa
2021-03-15 13:28:29 +00:00
Paul Duffin 8a63b042d5 Merge "Convert ...InstallHwasan.. tests to use fixtures" am: ef0449b0f3 am: feed9a6153 am: 972e1eafe0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d49be067f9984b1497dde48d39a4b25d9dda6a3
2021-03-15 12:55:23 +00:00
satayev ebfe02a781 Merge "Don't track modules that are only available to APEXes." am: 2338d6f6e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1628693

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78ef7f5255da2dffa208fd609052645c32c86bfe
2021-03-15 12:52:18 +00:00
Thiébaud Weksteen c634756619 Merge "Export OUT_DIR variable to rust-project.json" am: e5eb33b634
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1608134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4072bf62bf64ac74f30dc7012ebc2975ad4d073f
2021-03-15 12:50:40 +00:00
satayev 2338d6f6e4 Merge "Don't track modules that are only available to APEXes." 2021-03-15 12:47:00 +00:00
Thiébaud Weksteen e5eb33b634 Merge "Export OUT_DIR variable to rust-project.json" 2021-03-15 12:16:48 +00:00
Paul Duffin 972e1eafe0 Merge "Convert ...InstallHwasan.. tests to use fixtures" am: ef0449b0f3 am: feed9a6153
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I198ca31959a9f549af19344c136b30d6efd4cbe8
2021-03-15 12:12:47 +00:00
Rupert Shuttleworth 2e4219be73 Add a way to remove duplicates from Bazel label lists, to e.g. avoid duplicate deps.
Test: Added unit tests, and also resolves bp2build error.
Change-Id: I6e01d9e233ec21dbb244e5682cbeebbc3a1ac0c4
2021-03-15 11:51:31 +00:00
Paul Duffin feed9a6153 Merge "Convert ...InstallHwasan.. tests to use fixtures" am: ef0449b0f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626503

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2529a69e75f0c15e0ede332865792ad82670207f
2021-03-15 11:33:54 +00:00
Paul Duffin ef0449b0f3 Merge "Convert ...InstallHwasan.. tests to use fixtures" 2021-03-15 11:09:22 +00:00
Nicolas Geoffray d45fa2d8ba Merge "Treat core_platform as stable unless module uses legacy" am: fb856f6add am: b684567a46 am: 5a8f6c5c96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a43ed15e67d55c3e05d09698ca73520ef185745
2021-03-15 10:38:11 +00:00
Nicolas Geoffray 5a8f6c5c96 Merge "Treat core_platform as stable unless module uses legacy" am: fb856f6add am: b684567a46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I501e1099d77697b34c70f13b064840b94424d52d
2021-03-15 09:57:43 +00:00
Nicolas Geoffray b684567a46 Merge "Treat core_platform as stable unless module uses legacy" am: fb856f6add
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1619411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8706f0ad6f9dc4d105f8953f5a16c42d2cb75210
2021-03-15 09:17:49 +00:00
Nicolas Geoffray fb856f6add Merge "Treat core_platform as stable unless module uses legacy" 2021-03-15 08:42:43 +00:00
Thiébaud Weksteen ee6a89ba44 Export OUT_DIR variable to rust-project.json
This variable is required by rust-analyzer to correctly process crates
that uses the include!(concat!(env!("OUT_DIR"), ...)) pattern.

Adds an initialize method to baseCompiler to save the computed path for
this directory. It is not possible to use the BeginMutator as the
BaseModuleContext does not contain enough information to use
PathForModuleOut.

Bug: 175004835
Test: SOONG_GEN_RUST_PROJECT=1 m nothing; inspect rust-project.json
Change-Id: If47b3832d3cca5712ae87773c174a61f5ee27bf8
2021-03-15 08:13:20 +00:00
Remi NGUYEN VAN 06d2aa261b [automerger skipped] Merge "Add service-connectivity-pre-jarjar to legacy core platform list" am: aa52d66cd5 am: d0d52172ed am: a69859e489 -s ours
am skip reason: Change-Id I1a84ff07318da03f368cbccb25b6cabebb2de403 with SHA-1 aa8eec05c5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I343ca365fe77f0e95668668b6d2463b89e404fde
2021-03-15 03:30:35 +00:00
Remi NGUYEN VAN a69859e489 Merge "Add service-connectivity-pre-jarjar to legacy core platform list" am: aa52d66cd5 am: d0d52172ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d28b61f11550437eba438fefb7d202b4aab2a88
2021-03-15 02:49:00 +00:00
Remi NGUYEN VAN d0d52172ed Merge "Add service-connectivity-pre-jarjar to legacy core platform list" am: aa52d66cd5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1625964

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b7568d3e4ec0719c29eed58e2de2d16deffb57d
2021-03-15 02:05:41 +00:00
Remi NGUYEN VAN aa52d66cd5 Merge "Add service-connectivity-pre-jarjar to legacy core platform list" 2021-03-15 01:32:47 +00:00
Paul Duffin bf028b533d Extract PrepareForTestWithJavaSdkLibraryFiles from javaMockFS()
Needed for tests in both java and sdk packages.

Bug: 182638834
Test: m nothing
Change-Id: Ia8c5e7db47d8b63bf8dcf2965b3af60a4d35a9e5
2021-03-14 01:08:26 +00:00
Paul Duffin 6bac49c560 Convert testJavaError to test fixtures
Bug: 182638834
Test: m nothing
Change-Id: If6de91cd60fea36c945f2b0d51a04e26c838e4af
2021-03-14 01:08:26 +00:00
Paul Duffin 97ea153a65 Remove TestHelper am: d7aea1dbe5 am: 67cec05bc9 am: 329ee079a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629631

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0944047ef03baf958c8617996854226339a38168
2021-03-13 17:55:26 +00:00
Paul Duffin 343ad03ef8 Switch to Assert... functions in dexpreopt_bootjars_test.go am: 012b6679d3 am: 19e1af81a4 am: a4739872e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92c716a374b6c2be6d30da065b9bbc3e0a1e8ad4
2021-03-13 17:55:19 +00:00
Paul Duffin 69b3d2f6e2 Stop error handler relying on testing.T being embedded in TestResult am: c81854a642 am: 9683cee9c4 am: 6eb1543ec3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629630

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0783f8c584ac692f311c4224985168f6c73546f
2021-03-13 17:55:13 +00:00
Paul Duffin 8a39586fe3 Stop sdk package depending on testing.T being embedded in TestResult am: 36474d322b am: f1a5907244 am: e732e39a54
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629629

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabfdd3152a581458cfc86ce03f0431aca3bfb629
2021-03-13 17:55:04 +00:00
Paul Duffin 329ee079a9 Remove TestHelper am: d7aea1dbe5 am: 67cec05bc9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629631

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdf0193765896021a470543d8f741a1931ce59f9
2021-03-13 17:13:47 +00:00
Paul Duffin a4739872e0 Switch to Assert... functions in dexpreopt_bootjars_test.go am: 012b6679d3 am: 19e1af81a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba0ad156a724ac73f7575b02da119b69587c0d1d
2021-03-13 17:13:41 +00:00
Paul Duffin 6eb1543ec3 Stop error handler relying on testing.T being embedded in TestResult am: c81854a642 am: 9683cee9c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629630

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ab776be3831d97261287b44c690603d8acea86b
2021-03-13 17:13:35 +00:00
Paul Duffin e732e39a54 Stop sdk package depending on testing.T being embedded in TestResult am: 36474d322b am: f1a5907244
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629629

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5232486b54e60e579fbc5e8e97e4655eeaecd337
2021-03-13 17:13:26 +00:00
Paul Duffin 67cec05bc9 Remove TestHelper am: d7aea1dbe5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629631

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e6bbf87ae8b9bbf7d5b4767cc34b67e80b5cd68
2021-03-13 16:35:23 +00:00
Paul Duffin 19e1af81a4 Switch to Assert... functions in dexpreopt_bootjars_test.go am: 012b6679d3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633660

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a43c59f371af822d29e1fb5f380adc95971058d
2021-03-13 16:35:16 +00:00
Paul Duffin 9683cee9c4 Stop error handler relying on testing.T being embedded in TestResult am: c81854a642
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629630

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ee2bcb961b74e397b795e0194320a48f4175ef4
2021-03-13 16:35:07 +00:00
Paul Duffin f1a5907244 Stop sdk package depending on testing.T being embedded in TestResult am: 36474d322b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629629

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff501eb17aba2fe72263f3c502eaf7e9b6fa723c
2021-03-13 16:34:16 +00:00
Paul Duffin 0ed42d3c9d Clean up testApp and testAppConfig
Previously, testAppConfig added some extra files to the mock filesystem
before passing them to testConfig. However, those files are only needed
for TestApp so this converts TestApp to use test fixtures and populates
the mock filesystem with the extra files.

Without those extra files testApp and testAppConfig are equivalent to
testJava and testConfig respectively.

Bug: 181070625
Test: m nothing
Change-Id: I1d8a51223adde5b656948725bc4bc91040533625
2021-03-13 16:06:36 +00:00
Paul Duffin d7aea1dbe5 Remove TestHelper
Bug: 181070625
Test: m nothing
Change-Id: Idc39c8621424e25c1b4310c72ed2943d34a66bbc
2021-03-13 16:02:30 +00:00
Paul Duffin 012b6679d3 Switch to Assert... functions in dexpreopt_bootjars_test.go
Bug: 181070625
Test: m nothing
Change-Id: I74a0be8fab257966aecffa914fcc7c1e6f750eb2
2021-03-13 16:02:30 +00:00
Paul Duffin c81854a642 Stop error handler relying on testing.T being embedded in TestResult
This change is in preparation for removing testing.T from TestResult.

Bug: 181070625
Test: m nothing
Change-Id: Iac627cc3c9f922ec4a41ce657442e4139fe7defb
2021-03-13 16:00:51 +00:00
Paul Duffin 36474d322b Stop sdk package depending on testing.T being embedded in TestResult
This change is in preparation for removing testing.T from TestResult.

Bug: 181070625
Test: m nothing
Change-Id: I67535aff0d894e6e3d8456b75540f340af853355
2021-03-13 15:59:33 +00:00
Paul Duffin d6ac73143c [automerger skipped] Merge "Revert "Revert "Reinstate the enforcement of stable core platform API usage""" into rvc-qpr-dev-plus-aosp am: ccaee63a61 -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/+/13852185

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied42c72f67cfd29a74a653929bb51ed3e12aa905
2021-03-13 08:47:57 +00:00
Paul Duffin 6decd01358 [automerger skipped] Merge "Add secureprocessor to the legacy core platform API list" into rvc-qpr-dev-plus-aosp am: 2f45eccb8b -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/+/13839289

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7af41bdc7be228026cdf7a33a4bce5f484cb2db
2021-03-13 08:47:53 +00:00
Paul Duffin ccaee63a61 Merge "Revert "Revert "Reinstate the enforcement of stable core platform API usage""" into rvc-qpr-dev-plus-aosp 2021-03-13 08:09:26 +00:00
Paul Duffin 2f45eccb8b Merge "Add secureprocessor to the legacy core platform API list" into rvc-qpr-dev-plus-aosp 2021-03-13 08:09:26 +00:00
Paul Duffin 1b511a9f47 Migrate from result methods to function Asserts am: e84b1338c5 am: 37e8d92321 am: b364e7b212
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7f8e38989f273939aea30427ba61bdf88043e99
2021-03-13 03:48:12 +00:00