StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,110 Commits 1 Branch 0 Tags
ef3ada76c44bbcc2545b596d09b1a463be9f45eb
Commit Graph

3730 Commits

Author SHA1 Message Date
Paul Duffin
05f72de083 Convert TestJavaSdkLibraryEnforce to test fixtures 
Bug: 182638834
Test: m nothing
Change-Id: I99efe76008f9ca0996177f47923274ca594a6858
 2021-03-15 17:17:43 +00:00
Paul Duffin
aa6caa7fa8 Create sub tests for each test in TestJavaSdkLibraryEnforce 
Bug: 182638834
Test: m nothing
Change-Id: I509b071ee4e470da45159b2174aae7acf1b0eb1a
 2021-03-15 17:17:43 +00:00
Paul Duffin
2ff6d1b6d2 Provide support for preparing tests with prebuilt_apis 
Adds general support for generating a set of prebuilt apis for a set of
releases and modules. Plus some wrappers for common use cases.

This temporarily will delete any existing conflicting files and replace
them so that it can be used in tests without first removing
javaMockFS(). The future update that removes javaMockFS() will also
remove that workaround.

Bug: 182638834
Test: m nothing
Change-Id: If4e2118f2384b9866cf3f85a5afec1e2e4f9ac95
 2021-03-15 17:17:40 +00:00
Paul Duffin
ba2afa93d2 Merge "Extract PrepareForTestWithJavaSdkLibraryFiles from javaMockFS()" 2021-03-15 17:14:03 +00:00
Paul Duffin
56372081ed Merge "Convert testJavaError to test fixtures" 2021-03-15 17:13:55 +00:00
Paul Duffin
6f6f1eb83c Merge "Clean up testApp and testAppConfig" 2021-03-15 17:13:45 +00:00
Ulya Trafimovich
0aba252e15 Reimplement verify_uses_libraries.sh in manifest_check.py. 
Previously there were two different scripts that did similar things:
1) build/soong/scripts/manifest_check.py
2) build/make/core/verify_uses_libraries.sh

Both scripts extracted <uses-library> tags and `targetSdkVersion` from
the manifests of Java modules, but 1) worked for XML manifests, and 2)
worked for APKs. This CL reimplements the functionality from 2) in 1),
so that one script can handle both XML manifests and APKs.

Bug: 132357300

Test: lunch cf_x86_64_phone-userdebug && m && launch_cvd \
      adb wait-for-device && adb root && adb logcat \
      | grep -E 'ClassLoaderContext [a-z ]+ mismatch'
      # empty grep output, no errors

Change-Id: Id1b66e4f3f30f307dba70cb111c7571762cb546a
 2021-03-15 13:50:49 +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
satayev
2338d6f6e4 Merge "Don't track modules that are only available to APEXes." 2021-03-15 12:47:00 +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
fb856f6add Merge "Treat core_platform as stable unless module uses legacy" 2021-03-15 08:42:43 +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
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
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
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
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
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
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