Commit Graph

35462 Commits

Author SHA1 Message Date
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
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
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
Paul Duffin
37e8d92321 Migrate from result methods to function Asserts am: e84b1338c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7280a80b99b4188be7afdf2f584ae0318b9dc57
2021-03-13 02:02:00 +00:00
Paul Duffin
0902ddd388 Merge "Stop android package depending on testing.T being embedded in TestResult" am: bf6dcccfc4 am: 8dbca215ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629628

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cb19574938940d69a231be1d4b7d754398dc99b
2021-03-12 23:04:41 +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
8dbca215ed Merge "Stop android package depending on testing.T being embedded in TestResult" am: bf6dcccfc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629628

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8787793b34abdd96fe950fe09e46305e20c17bf4
2021-03-12 22:45:15 +00: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
Paul Duffin
bf6dcccfc4 Merge "Stop android package depending on testing.T being embedded in TestResult" 2021-03-12 21:45:39 +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
1e4e5172fa Merge "Delete defaultsFactory in java.go." am: b37b009b16
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06b8e31f39707325d3c33c6ca62d9b0ee5c25c3a
2021-03-12 19:07:50 +00:00
Jaewoong Jung
b37b009b16 Merge "Delete defaultsFactory in java.go." 2021-03-12 18:37:38 +00:00
Paul Duffin
a02cae345b Convert ...InstallHwasan.. tests to use fixtures
These tests rely on changing the definition of the "libc" module which
is a default module provided by the cc.GatherRequiredDepsForTest()
function. That function is called from within testApexContext() and so
added by default.

Previously, the tests relied on a number of factors to work:
1. All the default cc modules were added to the bp contents that were
   passed to testApexContext().
2. testApexContext() passed the augmented bp contents to
   TestArchConfig().
3. TestArchConfig() only stored the supplied bp contents in the root
   Android.bp file if it did not exist.

So, in order to override the default modules it simply made sure to add
its own Android.bp file into the file system first.

Unfortunately, that does not work with the test fixtures as the default
modules are defined in their own specific paths to avoid conflicting
with each other. To achieve the same effect as previously, i.e. no
default modules, this test uses an emptyFixtureFactory and only adds
preparers for cc and apex build components and ignores the default
module definitions altogether.

Bug: 181070625
Test: m nothing
Change-Id: Ic6b961dd2bd78c32cb326b2c7905426ee971c2d8
2021-03-12 18:26:41 +00:00
Paul Duffin
25bb4df81e Merge changes If7977493,I3b2ccf66 am: 5a0595639a am: 7f28027dd3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59799bd715b6f04a5f6e2f9d5340814efc7d23fd
2021-03-12 18:12:27 +00:00
Paul Duffin
e99772fd0a Merge "Remove unused TestResult methods" am: e2c140624c am: 86cf01868a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a62578d1a0ca6bb2c0c70a5f8bbca5c86156b21
2021-03-12 18:12:21 +00:00
Paul Duffin
7f28027dd3 Merge changes If7977493,I3b2ccf66 am: 5a0595639a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cf7ab4765deb5832fa717e79ed33b401c377d0f
2021-03-12 17:35:58 +00:00
Paul Duffin
86cf01868a Merge "Remove unused TestResult methods" am: e2c140624c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcf13a31b8633201fc87817f5d59568b26226c60
2021-03-12 17:34:28 +00:00
Paul Duffin
5a0595639a Merge changes If7977493,I3b2ccf66
* changes:
  Add new function Assert methods
  Separate TestHelper from fixtures
2021-03-12 17:27:25 +00:00
Paul Duffin
e2c140624c Merge "Remove unused TestResult methods" 2021-03-12 16:59:13 +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
fb44fbd6be Merge "Remove the robolectric heuristic out of java_test" am: c001dc6d2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic27b8d33b725d7787f1e95ccf68c43e9bcb16967
2021-03-12 16:15:20 +00:00
Julien Desprez
c001dc6d2f Merge "Remove the robolectric heuristic out of java_test" 2021-03-12 15:40:19 +00:00
Lev Proleev
a2f2edcb68 Merge "Add libruy_static to allowed_deps" am: f6b5f8217c am: 894c8eb61b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610793

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb0b3dd46d8e5aec6d5c1aadd1943a8b3f7a1fcd
2021-03-12 15:14:56 +00:00
Lev Proleev
894c8eb61b Merge "Add libruy_static to allowed_deps" am: f6b5f8217c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1610793

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62b88ffda8a4043eb6cb70798f6b406b4733d527
2021-03-12 14:42:27 +00:00
Paul Duffin
3d0ddff8ed Stop android 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: Ib51c7d4e5efdcbe0652df10b66140058a8bfa471
2021-03-12 14:26:04 +00:00
Paul Duffin
9dcf253197 Add new function Assert methods
Bug: 181070625
Test: m nothing
Change-Id: If7977493d4f7380e746df1b9b8b4cb13c39abeac
2021-03-12 14:25:33 +00:00
Paul Duffin
3fdb1bd9a2 Remove unused TestResult methods
Left over from a previous incarnation of the fixture mechanism.

Bug: 181070625
Test: m nothing
Change-Id: Ifb3811b7b030613cbff93994f7d370d402b1e73d
2021-03-12 14:25:33 +00:00
Paul Duffin
0550055007 Separate TestHelper from fixtures
Although they are intended to be used together they are separate pieces
of functionality so should be separate.

Bug: 181070625
Test: m nothing
Change-Id: I3b2ccf66748a3c53b63c112256a8eb20e0448179
2021-03-12 14:25:33 +00:00
Lev Proleev
f6b5f8217c Merge "Add libruy_static to allowed_deps" 2021-03-12 14:00:45 +00:00
Cindy Zhou
87075e20e7 Merge "Enable cfi for 32bit arch" am: 34d300ba76 am: 809e91cf12
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc18a5d82cc961ae132b081f27809f5ab0683cc0
2021-03-12 13:22:26 +00:00
Cindy Zhou
809e91cf12 Merge "Enable cfi for 32bit arch" am: 34d300ba76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1570600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I853848ed2877765da887880dd5fc7901b64ade72
2021-03-12 13:04:52 +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
Cindy Zhou
34d300ba76 Merge "Enable cfi for 32bit arch" 2021-03-12 12:41:39 +00:00
Paul Duffin
34fc4cf2fb Merge "Convert testDexpreoptBoot to use test fixtures" am: a8c443618a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I022fddb34521d8835efe57bea93bd858183d0a7c
2021-03-12 12:24:35 +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
Paul Duffin
a8c443618a Merge "Convert testDexpreoptBoot to use test fixtures" 2021-03-12 11:40:03 +00:00