Commit Graph

4086 Commits

Author SHA1 Message Date
Christian Wailes
2f2708def3 Merge "Add test suite to legacy core platform allowlist." am: 7d1f1cf27c am: ae3f51b415 am: a537f721d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634799

Change-Id: I353fb8de6827f61dd195fd8d6eb30b8fc669aa3f
2021-03-17 22:07:53 +00:00
Jaewoong Jung
300fd07df1 Merge "Improve java.go readability." am: 9f315dea28 am: b163cc04ce am: b348954705
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627239

Change-Id: Ia988226bd3485f2e716c330fc65c914f6f068037
2021-03-17 16:19:00 +00:00
Treehugger Robot
1cf5826a85 Merge "Don't depend on nonexistent manifest when manifest_check is disabled." am: 8974f1706e am: da4eb03a9d am: 7be2dbdc41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640322

Change-Id: I6d8aeccc36dbe0853b07363d742920e52130d027
2021-03-17 16:18:45 +00:00
Paul Duffin
8d660568b9 Merge "Fix hiddenapi tests to work without javaMockFS()" am: 248f386558 am: 609df5c2ca am: db6fe68b71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634630

Change-Id: I9a7fbffaf9e8a3c638cbc34b0567447dc02bb4b7
2021-03-17 16:18:37 +00:00
Paul Duffin
b9a4a0c6dd Merge "Convert hiddenapi tests to use test fixtures" am: af0379ca9c am: 5308375fd4 am: 1a2f26004a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634629

Change-Id: I24182aca5356301804ce068ffa5fe17e91c77af8
2021-03-17 16:18:30 +00:00
Paul Duffin
6ade27941a Merge "Fix TestJavaSdkLibrary... tests to work without javaMockFS()" am: ebca5e6a68 am: a6ece5dde2 am: 971fbecedd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634628

Change-Id: Ib3ec5e55a91dbb5883c1c53154c91a32dbd6a5ee
2021-03-17 16:18:23 +00:00
Paul Duffin
5df5ad660d Merge "Convert JavaSdkLibrary... tests in java package to test fixtures" am: fb3fc0cf40 am: dcdefb6b53 am: b75252399c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634627

Change-Id: I272a50cea888cf1db902e29c647072bca4f308f2
2021-03-17 16:18:16 +00:00
Ulyana Trafimovich
6256f66cd9 Merge "Reimplement verify_uses_libraries.sh in manifest_check.py." am: 2002bfa817 am: 8bd0efdef8 am: 072f40803f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614807

Change-Id: Ic40dfb25a6e02582ce1399f872cc149bf958cab4
2021-03-17 16:17:29 +00:00
Christian Wailes
a537f721d5 Merge "Add test suite to legacy core platform allowlist." am: 7d1f1cf27c am: ae3f51b415
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634799

Change-Id: Ib38b47e0cd3579a0041a6446c12d2843607f77e5
2021-03-16 23:35:50 +00:00
Christian Wailes
7d1f1cf27c Merge "Add test suite to legacy core platform allowlist." 2021-03-16 23:02:39 +00:00
Jaewoong Jung
b348954705 Merge "Improve java.go readability." am: 9f315dea28 am: b163cc04ce
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627239

Change-Id: Ia0b76e8b4bb0c366a9254052e2f2fe5bfc74701d
2021-03-16 22:34:59 +00:00
Jaewoong Jung
9f315dea28 Merge "Improve java.go readability." 2021-03-16 21:32:48 +00:00
Treehugger Robot
7be2dbdc41 Merge "Don't depend on nonexistent manifest when manifest_check is disabled." am: 8974f1706e am: da4eb03a9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640322

Change-Id: I493923edaea177492800a001dfd80a7d3ea17c3d
2021-03-16 21:11:26 +00:00
Treehugger Robot
8974f1706e Merge "Don't depend on nonexistent manifest when manifest_check is disabled." 2021-03-16 20:02:42 +00:00
Paul Duffin
cdf2426d76 Switch platform_compat_config to use common arch am: 4defbf4d39 am: 75c51ba191 am: e9292b1459
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638281

Change-Id: I43f4b4ff67f19326ba4124a4ed86ef4ce86feaef
2021-03-16 17:30:06 +00:00
Paul Duffin
db6fe68b71 Merge "Fix hiddenapi tests to work without javaMockFS()" am: 248f386558 am: 609df5c2ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634630

Change-Id: Ie65ddae0cde35a55da648eebd2ea76a37498963e
2021-03-16 16:20:24 +00:00
Paul Duffin
1a2f26004a Merge "Convert hiddenapi tests to use test fixtures" am: af0379ca9c am: 5308375fd4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634629

Change-Id: Ib6affe3d3dfa3808527aee36e4ce93c8e82283d3
2021-03-16 16:20:20 +00:00
Paul Duffin
971fbecedd Merge "Fix TestJavaSdkLibrary... tests to work without javaMockFS()" am: ebca5e6a68 am: a6ece5dde2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634628

Change-Id: Ieeb6d2e683a7b401a5d63c61085ca6e9110756a8
2021-03-16 16:20:16 +00:00
Paul Duffin
b75252399c Merge "Convert JavaSdkLibrary... tests in java package to test fixtures" am: fb3fc0cf40 am: dcdefb6b53
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634627

Change-Id: Ib14f15d4b27741b92f51a2a17d738c993da88505
2021-03-16 16:20:12 +00:00
Ulya Trafimovich
a76d6606ce Don't depend on nonexistent manifest when manifest_check is disabled.
This is a follow-up for https://android-review.googlesource.com/1614807.

Bug: 132357300
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Test: lunch qemu_trusty_arm64-userdebug && \
  m out/soong/.intermediates/packages/apps/DocumentsUI/DocumentsUI/android_common/DocumentsUI-unsigned.apk
Change-Id: I84c5d171bd976f35f342abd94b592506c71e4b1d
2021-03-16 15:34:50 +00:00
Ulyana Trafimovich
072f40803f Merge "Reimplement verify_uses_libraries.sh in manifest_check.py." am: 2002bfa817 am: 8bd0efdef8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1614807

Change-Id: I9a3125db222d9dc31cdc9241b04f4b3303326718
2021-03-16 14:45:33 +00:00
Paul Duffin
e9292b1459 Switch platform_compat_config to use common arch am: 4defbf4d39 am: 75c51ba191
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638281

Change-Id: I213738e09bee4613f93203b0dd6e935b07957114
2021-03-16 14:45:28 +00:00
Paul Duffin
dc92abb705 Fix hiddenapi tests to work without javaMockFS()
Bug: 182638834
Test: m nothing
Change-Id: I32e0173f3c2e97b6d6d831c6cfa51cc500f8d2b1
2021-03-16 14:25:21 +00:00
Paul Duffin
175947f654 Convert hiddenapi tests to use test fixtures
These tests rely on files provided by javaMockFS() so have been
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: Ifd4069a74fcf67e555f998ddbc4de3fde26b2aae
2021-03-16 14:25:21 +00:00
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