StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,228 Commits 1 Branch 0 Tags
ae012ff969ee48c006fac5cd72358c8f192566a0
Commit Graph

4312 Commits

Author SHA1 Message Date
Paul Duffin
163043d615 Fix TestJavaSdkLibrary... tests to work without javaMockFS() 
Bug: 182638834
Test: m nothing
Change-Id: I140b88b3fdf2c532d266a196fee84675c518d859
 2021-03-16 14:25:21 +00:00
Paul Duffin
22b77cd538 Convert JavaSdkLibrary... tests in java package to test fixtures 
These tests rely on files provided by javaMockFS() so need to are being
converted to test fixtures to allow them to remove that dependency
which will allow javaMockFS() to be removed.

Bug: 182638834
Test: m nothing
Change-Id: If736b95d134fe73c0a0ccd438ec31e93568fb929
 2021-03-16 14:25:21 +00:00
Ulyana Trafimovich
2002bfa817 Merge "Reimplement verify_uses_libraries.sh in manifest_check.py." 2021-03-16 13:37:03 +00:00
Paul Duffin
cb5f38f071 Provide preparer for using platform_compat_config modules am: 4eb4b41cef am: 74b85bd619 am: e24da8d2c4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626504

Change-Id: I158919b4ef1886ea21ecce1f04bbe822dd3d2fb6
 2021-03-16 08:50:46 +00:00
Paul Duffin
e24da8d2c4 Provide preparer for using platform_compat_config modules am: 4eb4b41cef am: 74b85bd619 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626504

Change-Id: I71104256894fe69246740b42d5c7647e69353697
 2021-03-16 08:04:58 +00:00
Paul Duffin
4defbf4d39 Switch platform_compat_config to use common arch 
Bug: 182816033
Test: m nothing
Change-Id: If8886edd9278d67fe2b6288a6bd8b152f2314401
 2021-03-15 23:19:39 +00:00
Paul Duffin
c14caffc2d Convert TestJavaSdkLibraryEnforce to test fixtures am: 05f72de083 am: d486fc968f am: 6b0e66b6a6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634626

Change-Id: I14070d1cf8383c5638531b57bdeda7fd56fbfe83
 2021-03-15 21:21:07 +00:00
Paul Duffin
5ca0e2e52b Create sub tests for each test in TestJavaSdkLibraryEnforce am: aa6caa7fa8 am: 1094ec685f am: f2157304dd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634625

Change-Id: I2cf16be39f897cc6214fef8a52f574eddbc341c3
 2021-03-15 21:21:04 +00:00
Paul Duffin
747b02dd54 Provide support for preparing tests with prebuilt_apis am: 2ff6d1b6d2 am: f2c9340f3e am: 17fc657cf2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634624

Change-Id: I9e1c707dbea5c728f421c317d669e53ea8e1c54c
 2021-03-15 21:20:41 +00:00
Jaewoong Jung
bc15e3a798 Improve java.go readability. 
Test: TreeHugger
Change-Id: I98bb7bddb740451ff2ccd28dcdaddff27e35a8cd
 2021-03-15 13:58:44 -07:00
Paul Duffin
6b0e66b6a6 Convert TestJavaSdkLibraryEnforce to test fixtures am: 05f72de083 am: d486fc968f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634626

Change-Id: I3a0cbf953d393309ab2b4ee9ab4011095f0a5fc5
 2021-03-15 20:53:44 +00:00
Paul Duffin
f2157304dd Create sub tests for each test in TestJavaSdkLibraryEnforce am: aa6caa7fa8 am: 1094ec685f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634625

Change-Id: I4ac34464a7f81461d3f6ad230ea81a8ee83fc9da
 2021-03-15 20:53:42 +00:00
Paul Duffin
17fc657cf2 Provide support for preparing tests with prebuilt_apis am: 2ff6d1b6d2 am: f2c9340f3e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634624

Change-Id: I1cc640c7e73b6627936ed95460598caefa65af14
 2021-03-15 20:53:39 +00:00
Paul Duffin
4eb4b41cef Provide preparer for using platform_compat_config modules 
Bug: 181070625
Test: m nothing
Change-Id: I92ec022fae0951a21c2e885d3ded7c98daacfcfc
 2021-03-15 19:56:38 +00:00
Paul Duffin
cd5a5f3e06 Merge "Extract PrepareForTestWithJavaSdkLibraryFiles from javaMockFS()" am: ba2afa93d2 am: df1d7d5f49 am: b42e68316e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634623

Change-Id: Id67624a0a6e7e3a4efd71a2cf203ab63c4baabbb
 2021-03-15 18:50:23 +00:00
Paul Duffin
fcbf27518f Merge "Convert testJavaError to test fixtures" am: 56372081ed am: c0acd402ef am: ebde79862a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634622

Change-Id: I9e3857e113e22e82d12b7421e1a46140e2b71ee0
 2021-03-15 18:50:02 +00:00
Paul Duffin
794339436e Merge "Clean up testApp and testAppConfig" am: 6f6f1eb83c am: 4f5f1d89d3 am: 7c46058e77 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633661

Change-Id: Ibc7ae441a8f2bbddeebc7102e1a5e5661eef75f8
 2021-03-15 18:49:06 +00:00
Paul Duffin
b42e68316e Merge "Extract PrepareForTestWithJavaSdkLibraryFiles from javaMockFS()" am: ba2afa93d2 am: df1d7d5f49 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634623

Change-Id: Ie8cfa778d00f2dc4145d449718ba6de87b2671a5
 2021-03-15 18:04:24 +00:00
Paul Duffin
ebde79862a Merge "Convert testJavaError to test fixtures" am: 56372081ed am: c0acd402ef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634622

Change-Id: I1fdaa8bb01ac6138c8c4f733424ad527499cbbd1
 2021-03-15 18:04:19 +00:00
Paul Duffin
7c46058e77 Merge "Clean up testApp and testAppConfig" am: 6f6f1eb83c am: 4f5f1d89d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633661

Change-Id: I103a2818e3c8707ff5e7c398fea0d0d72201f408
 2021-03-15 18:04:01 +00:00
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
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
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
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
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
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
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
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
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
152ae03d10 Merge "Delete defaultsFactory in java.go." am: b37b009b16 am: 1e4e5172fa am: 5151495607 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I996c1d21275ddf9e8d56655eba0133838cf8fe29
 2021-03-12 20:30:18 +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
Julien Desprez
47101af8ed Merge "Remove the robolectric heuristic out of java_test" am: c001dc6d2f am: fb44fbd6be am: ba380e444b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1624564

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99286890e99bed27d4052ea7236eb97b9eddeafd
 2021-03-12 18:41:38 +00:00