Commit Graph

39111 Commits

Author SHA1 Message Date
TreeHugger Robot a089ef0de4 Merge "Move allowed_deps.txt to packages/modules/common." into sc-dev 2021-03-16 17:45:34 +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 fc0b2c7f6b Disallow platform_compat_config modules in apex prebuilts property am: 1bc21dc7e6 am: c6df3b278a am: 3c54ef1e10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638280

Change-Id: I62615c1ed2069dfed50c1a576dbd8f702ece662b
2021-03-16 15:46:29 +00:00
Artur Satayev 8dfcbe466c Move allowed_deps.txt to packages/modules/common.
Bug: 179234385
Test: run update-apex-allowed-deps.sh locally
Change-Id: I8e8864468b87342c688d001bc5f6e6f8416863ed
Merged-In: I8e8864468b87342c688d001bc5f6e6f8416863ed
(cherry picked from commit 732d6264210513b971205b5c9f1b2f49b9cafdf3)
2021-03-16 15:02:55 +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 3c54ef1e10 Disallow platform_compat_config modules in apex prebuilts property am: 1bc21dc7e6 am: c6df3b278a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638280

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

Change-Id: Ib1183e73bebbbb714fa6545634ba2c06fb378feb
2021-03-16 14:09:55 +00:00
Paul Duffin c6df3b278a Disallow platform_compat_config modules in apex prebuilts property am: 1bc21dc7e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638280

Change-Id: I42b92aca35d809804740da1998840d71dd629fcd
2021-03-16 14:08:57 +00:00
Paul Duffin c605053f97 Add new compat_configs property to the apex am: 3abc174cfd am: d4716ce5a6 am: f75ab18b5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638279

Change-Id: I2cd91954b7fba10e1c5cbbef194fc365b3103745
2021-03-16 10:11:22 +00:00
Paul Duffin a13f1c8dc0 Convert TestCompatConfig test to use test fixtures am: a369c7b50d am: 28cae4ca6f am: 6fb02328eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626505

Change-Id: I852b9b300a6e98c765e3c968023399b1152faa20
2021-03-16 09:51:45 +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 f75ab18b5b Add new compat_configs property to the apex am: 3abc174cfd am: d4716ce5a6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638279

Change-Id: I3822016f85c030f27820538ba133ec007861417c
2021-03-16 08:05:09 +00:00
Paul Duffin 6fb02328eb Convert TestCompatConfig test to use test fixtures am: a369c7b50d am: 28cae4ca6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626505

Change-Id: Ief32c21320ead2b92f47b3e485e2c3736290903f
2021-03-16 08:05:05 +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 d4716ce5a6 Add new compat_configs property to the apex am: 3abc174cfd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638279

Change-Id: I5197d5ced2dad822c986a8874afef36c29c2fe25
2021-03-16 07:26:37 +00:00
Paul Duffin 28cae4ca6f Convert TestCompatConfig test to use test fixtures am: a369c7b50d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1626505

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

Change-Id: Id9af1fa24826b17936b206242e769dda0e905167
2021-03-16 07:25:50 +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 1bc21dc7e6 Disallow platform_compat_config modules in apex prebuilts property
Bug: 182816033
Test: m nothing
Change-Id: I50dcc358e8ae143e21b1fbf1a12835bf1342606f
2021-03-15 23:19:39 +00:00
Paul Duffin 3abc174cfd Add new compat_configs property to the apex
Bug: 182816033
Test: m nothing
Change-Id: I485d7b178c0ed17e336a6ac2a13e8313426f374b
2021-03-15 23:19:36 +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
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 d486fc968f Convert TestJavaSdkLibraryEnforce to test fixtures am: 05f72de083
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634626

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

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

Change-Id: I8d07c9fa1b50ebc5f064fa30a376dc58b1e691f9
2021-03-15 20:01:24 +00:00
Paul Duffin a369c7b50d Convert TestCompatConfig test to use test fixtures
As this test is the only test in the apex package to use the
platform_compat_config module type it does not make sense to include
that in all the tests so instead this converts the test to use fixtures
so it can easily customize it with the additional module type.

Bug: 181070625
Test: m nothing
Change-Id: I56fda772ee336db6cfb677143aa28b1a18911bff
2021-03-15 19:56:38 +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 df1d7d5f49 Merge "Extract PrepareForTestWithJavaSdkLibraryFiles from javaMockFS()" am: ba2afa93d2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634623

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

Change-Id: I82e90bcaf17b358aaa72b7c5c79fb0911282edff
2021-03-15 17:45:29 +00:00
Paul Duffin 4f5f1d89d3 Merge "Clean up testApp and testAppConfig" am: 6f6f1eb83c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633661

Change-Id: I58649007c746fb5c7b1405a2e36c464a413ab7b7
2021-03-15 17:44:16 +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
Jiyong Park 37dc2eda4d Merge "bootimg supports v4 header" am: ca5e611e0a am: d279ff2313 am: 291df17d28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620744

Change-Id: I555633415b172bd60965ba9291cebb8be4ec7f35
2021-03-15 16:10:06 +00:00
Treehugger Robot e9d308ce1a Merge "Add a way to remove duplicates from Bazel label lists, to e.g. avoid duplicate deps." am: 07d73efa2d am: 3942324565 am: cb76ff52c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633479

Change-Id: I9cc05bc3f3f707df81c0c137d795777a04336146
2021-03-15 16:09:48 +00:00
Jiyong Park 291df17d28 Merge "bootimg supports v4 header" am: ca5e611e0a am: d279ff2313
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d909a9b7b195d6cc0fc3c6157f741b1912cc7e5
2021-03-15 15:23:59 +00:00
Treehugger Robot cb76ff52c4 Merge "Add a way to remove duplicates from Bazel label lists, to e.g. avoid duplicate deps." am: 07d73efa2d am: 3942324565
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1633479

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If94bd0ed1cfd46f73079a2e761e6e8669333303b
2021-03-15 15:23:54 +00:00