Paul Duffin
ef3ada76c4
Merge "Reorganize the platform_compat_config.go file" am: 177cba31cf
am: 95b93bf6a8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642104
Change-Id: I282d3c89167ec58b9b424c5d7b5ee01ca1cfbbd9
2021-03-18 09:13:14 +00:00
Paul Duffin
8255a16c37
Merge "Fix app tests to work without javaMockFS()" am: e26e597fc8
am: 9679be9ea5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634633
Change-Id: I402492eedbecf7db1d37d14791ff42fd096912b4
2021-03-18 08:54:35 +00:00
Paul Duffin
59ff1fbc73
Merge "Convert app tests that depend on javaMockFS() to test fixtures" am: 9e993c6162
am: 85bcdfcb3c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634632
Change-Id: I9fb3e99104264bb607ca7d14234d559794948555
2021-03-18 08:54:26 +00:00
Paul Duffin
13b31ab6f2
Merge "Convert TestUsesLibraries to test fixtures" am: 8a6fef4db3
am: 3e2173905d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634631
Change-Id: Iac19b34bbca50601ab205a55ea4e139a85ad35b5
2021-03-18 08:54:20 +00:00
Paul Duffin
177cba31cf
Merge "Reorganize the platform_compat_config.go file"
2021-03-18 08:39:39 +00:00
Paul Duffin
e26e597fc8
Merge "Fix app tests to work without javaMockFS()"
2021-03-18 08:00:29 +00:00
Paul Duffin
9e993c6162
Merge "Convert app tests that depend on javaMockFS() to test fixtures"
2021-03-18 07:59:54 +00:00
Paul Duffin
8a6fef4db3
Merge "Convert TestUsesLibraries to test fixtures"
2021-03-18 07:59:04 +00:00
Paul Duffin
961543309f
Reorganize the platform_compat_config.go file
...
The types and methods are separated and interleaved with each other
so this moves them so that they are together.
Bug: 182402754
Test: m nothing
Change-Id: I275f6af30491d2440499b9ee3f201eea227d23f8
2021-03-17 17:50:22 +00:00
Colin Cross
27a4326c78
Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList am: 70c4741215
am: 37225a7b05
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634804
Change-Id: Iec8ea5fdda5786380e52d244d73e3dd182d7bc52
2021-03-17 15:50:48 +00:00
Colin Cross
37225a7b05
Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList am: 70c4741215
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634804
Change-Id: Id1d3d6b1047f0492eaa88ada521dd8c4cdb22670
2021-03-17 15:31:16 +00:00
Colin Cross
45a4971808
Merge changes from topic "rule_builder_rsp"
...
* changes:
Remove unescaped spans support from RuleBuilder
Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList
Ninja escape RuleBuilder rule params
2021-03-17 15:14:19 +00:00
Paul Duffin
2645a2912f
Fix app tests to work without javaMockFS()
...
Bug: 182638834
Test: m nothing
Change-Id: Ia1815557e6d9dba1cb24f824a988c7599263bf85
2021-03-17 14:01:02 +00:00
Paul Duffin
cdb88a996a
Convert app tests that depend on javaMockFS() to test fixtures
...
Bug: 182638834
Test: m nothing
Change-Id: Ice668cf58695839d4929a0744822c0ded441d9c4
2021-03-17 14:01:02 +00:00
Paul Duffin
d234b418a5
Convert TestUsesLibraries to test fixtures
...
This test relies on files provided by javaMockFS() so has been
converted to test fixtures to allow it to remove that dependency which
will allow javaMockFS() to be removed.
Bug: 182638834
Test: m nothing
Change-Id: I77b0205c91ff94b1c3c9ca00d4711451e3671571
2021-03-17 14:01:02 +00:00
Treehugger Robot
299adde645
Merge "Run InitAndroidArchModule last in factory functions." am: 797b03eec9
am: e3fd959661
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641400
Change-Id: I360027624f4e5773bb2851b53025f3c56f823c36
2021-03-17 12:34:15 +00:00
Treehugger Robot
797b03eec9
Merge "Run InitAndroidArchModule last in factory functions."
2021-03-17 11:07:13 +00:00
Yuexi Ma
f963e4479e
Merge "Export a few utility methods" am: b96a04ba49
am: b2bfff678e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620219
Change-Id: I78ea84a8ab77b6df96f98ab0e6ee766ce4397892
2021-03-17 03:07:35 +00:00
Yuexi Ma
b96a04ba49
Merge "Export a few utility methods"
2021-03-17 01:40:51 +00:00
Martin Stjernholm
b79c7f1101
Run InitAndroidArchModule last in factory functions.
...
It calls InitAndroidModule which retrieves the properties, so all
AddProperties must go before it.
Test: `m nothing` with new ART prebuilt drop that has a
prebuilt_boot_image module.
Bug: 177892522
Change-Id: Ia09db9ef17148d36d8d4f25df3f1bf4f528a2fc8
2021-03-17 00:31:15 +00:00
Colin Cross
70c4741215
Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList
...
Using $out.rsp as the rsp file adds extra complexity around keeping
the $ unescaped. Make callers to FlagWithRspFileInputList provide
an explicit path for the rsp file instead.
Bug: 182612695
Test: rule_builder_test.go
Change-Id: I3f531d80c1efa8a9d09aac0a63790c5b11a9f0c6
2021-03-16 16:52:56 -07: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
Yuexi Ma
627263fece
Export a few utility methods
...
Add a few utility methods to support generating TradeFed test plan in C-Suite
Test: go test .
Change-Id: I86a505068b5d5aa0f5a37b3e3a2465839a7480ef
2021-03-16 15:57:59 -07: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
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
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
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
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