Commit Graph

52348 Commits

Author SHA1 Message Date
Treehugger Robot
cff5016d88 Merge "apex.custom_sign_tool property" am: cae893ae40 am: e18be41278 am: f11c7c9e18 am: 4c549b825a am: a18a62bafa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869522

Change-Id: Id484c324ea7c73ddb8e610c476535bb11785202d
2021-10-30 01:06:39 +00:00
Treehugger Robot
a18a62bafa Merge "apex.custom_sign_tool property" am: cae893ae40 am: e18be41278 am: f11c7c9e18 am: 4c549b825a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869522

Change-Id: Ie62620c4f84cdc001a72d2fe527df892a6227dce
2021-10-30 00:48:05 +00:00
Treehugger Robot
4c549b825a Merge "apex.custom_sign_tool property" am: cae893ae40 am: e18be41278 am: f11c7c9e18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869522

Change-Id: I8a56843f67f6a10349d9c4971596979bf1b4ffd3
2021-10-30 00:30:32 +00:00
Treehugger Robot
f11c7c9e18 Merge "apex.custom_sign_tool property" am: cae893ae40 am: e18be41278
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869522

Change-Id: I191fcd8a85296f208f0dbbb151c93bc09f8be7a6
2021-10-30 00:13:05 +00:00
Treehugger Robot
e18be41278 Merge "apex.custom_sign_tool property" am: cae893ae40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1869522

Change-Id: I9d94371728b68252e0056a9574fe7d0791c7ae68
2021-10-29 23:56:00 +00:00
TreeHugger Robot
20a1c5e8c9 Merge "Fix attribute names in generated permissions.xml" 2021-10-29 23:43:46 +00:00
Treehugger Robot
cae893ae40 Merge "apex.custom_sign_tool property" 2021-10-29 23:39:26 +00:00
Treehugger Robot
a017247fd3 Merge "Revert "Do not build tests with ThinLTO"" am: a471535c72 am: 77f08017ab am: 038ce8bb1d am: bdd85d034a am: f80d303ae9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874098

Change-Id: I66ff65265ae8a5523a5f2c93f492ae5f47c426b6
2021-10-29 21:07:59 +00:00
Paul Duffin
787567f779 Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861 am: e8412c4e7a am: fed3551805 am: 2a27960bd6 am: 8daad8f988 am: cc7a0a5a1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873694

Change-Id: I21f7c00a945b8872224e84b88733483ec1de75f7
2021-10-29 21:06:37 +00:00
Treehugger Robot
f80d303ae9 Merge "Revert "Do not build tests with ThinLTO"" am: a471535c72 am: 77f08017ab am: 038ce8bb1d am: bdd85d034a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874098

Change-Id: I8ef1e23328a4dbd8f2ccecb700875ff834cc3756
2021-10-29 20:51:17 +00:00
Paul Duffin
cc7a0a5a1c Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861 am: e8412c4e7a am: fed3551805 am: 2a27960bd6 am: 8daad8f988
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873694

Change-Id: I0028f8cd5ac1a702ccf9f0db8fb060fd3a8f12e2
2021-10-29 20:48:09 +00:00
Treehugger Robot
bdd85d034a Merge "Revert "Do not build tests with ThinLTO"" am: a471535c72 am: 77f08017ab am: 038ce8bb1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874098

Change-Id: I2fd52243abf7a50fbe4cf527173195e9e93ee694
2021-10-29 20:30:53 +00:00
Paul Duffin
8daad8f988 Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861 am: e8412c4e7a am: fed3551805 am: 2a27960bd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873694

Change-Id: I4b4bb783d5226a309fcdd9e2d2dc4a0c782b423f
2021-10-29 20:30:29 +00:00
Treehugger Robot
038ce8bb1d Merge "Revert "Do not build tests with ThinLTO"" am: a471535c72 am: 77f08017ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874098

Change-Id: Iecc95a11903c804c3454348967a9901cd366a6c0
2021-10-29 20:13:05 +00:00
Paul Duffin
2a27960bd6 Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861 am: e8412c4e7a am: fed3551805
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873694

Change-Id: If7edc3a99f09c61806f1e010f88aa06f18e004f6
2021-10-29 20:12:45 +00:00
Treehugger Robot
77f08017ab Merge "Revert "Do not build tests with ThinLTO"" am: a471535c72
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874098

Change-Id: If0c43fa11b2fe3b5e8f0b43860d0b99ade205309
2021-10-29 19:56:26 +00:00
Paul Duffin
fed3551805 Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861 am: e8412c4e7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1873694

Change-Id: Ib2b791e2fe8b8685f28c07f0ecd09cdd9a2fba1e
2021-10-29 19:55:58 +00:00
Treehugger Robot
a471535c72 Merge "Revert "Do not build tests with ThinLTO"" 2021-10-29 19:48:30 +00:00
Paul Duffin
e8412c4e7a Merge changes I88ee9709,If2ea3fde,I657fbcde,I585a8861
* changes:
  Use toModule for all "standard" API surfaces
  Run TestClasspath test cases with Always_use_prebuilt_sdks=true/false
  Refactor TestClasspath to simplify follow up change
  Add tests for prebuilts of all API surfaces
2021-10-29 19:41:33 +00:00
Colin Cross
854fa57eea Merge "Revert "Make installable arch-variant for cc modules"" am: 972e7ba893 am: c6dd42f2ae am: b6289005da am: 9978e476d1 am: 7b570f08c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875314

Change-Id: I1754ded22646943e4273b926e4e426d6cc21dd2c
2021-10-29 19:36:53 +00:00
Jiakai Zhang
feaf17900a Merge "Add a build-time check for dexpreopting system server jars." am: 65947f6fc4 am: 4e5ffa8d5c am: c5ae770e62 am: ab317cfdc7 am: 544d9fe9ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840058

Change-Id: I340b1f3f2bf32d1bd9ac2b2ccc5c856648319487
2021-10-29 19:36:32 +00:00
Colin Cross
7b570f08c9 Merge "Revert "Make installable arch-variant for cc modules"" am: 972e7ba893 am: c6dd42f2ae am: b6289005da am: 9978e476d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875314

Change-Id: I87ab1390c13c22f9628beaad7b3abb517fc451ae
2021-10-29 19:16:49 +00:00
Jiakai Zhang
544d9fe9ef Merge "Add a build-time check for dexpreopting system server jars." am: 65947f6fc4 am: 4e5ffa8d5c am: c5ae770e62 am: ab317cfdc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840058

Change-Id: I8187af13640b29fb53831e7f5c7494096ecb7a67
2021-10-29 19:16:32 +00:00
Colin Cross
9978e476d1 Merge "Revert "Make installable arch-variant for cc modules"" am: 972e7ba893 am: c6dd42f2ae am: b6289005da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875314

Change-Id: I7e9f677f619414a71f3d8ff6629ada3f0896ca1e
2021-10-29 19:01:25 +00:00
Jiakai Zhang
ab317cfdc7 Merge "Add a build-time check for dexpreopting system server jars." am: 65947f6fc4 am: 4e5ffa8d5c am: c5ae770e62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840058

Change-Id: I2e3611aa377d3dfcef5922856e56d8d4eea1b6a3
2021-10-29 19:01:12 +00:00
Colin Cross
b6289005da Merge "Revert "Make installable arch-variant for cc modules"" am: 972e7ba893 am: c6dd42f2ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875314

Change-Id: I3cbd2651039034ad699e014aa8a8c9949651f493
2021-10-29 18:43:13 +00:00
Jiakai Zhang
c5ae770e62 Merge "Add a build-time check for dexpreopting system server jars." am: 65947f6fc4 am: 4e5ffa8d5c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840058

Change-Id: I21d31cd549ed63a70de4c3e634b1c8b25371bfb0
2021-10-29 18:43:00 +00:00
Colin Cross
c6dd42f2ae Merge "Revert "Make installable arch-variant for cc modules"" am: 972e7ba893
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1875314

Change-Id: I2ac1120f1a596759e7cf85f4580caa62b7191cba
2021-10-29 18:18:42 +00:00
Jiakai Zhang
4e5ffa8d5c Merge "Add a build-time check for dexpreopting system server jars." am: 65947f6fc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1840058

Change-Id: Ie4a934d49ede52be2a74724061d8f1af1534847d
2021-10-29 18:18:18 +00:00
Pedro Loureiro
bde653e5fd Fix attribute names in generated permissions.xml
Previously it would write min_device_sdk whereas the correct name should
be min-device-sdk. This happened for all shared libs attributes.

Test: m nothing
Test: manually installed an apex with a shared lib and made sure PM used
the attributes as expected

Bug: 191978330

Change-Id: Iecf7edd6bae98c7af908d3f320f10ae4973d0396
2021-10-29 18:16:42 +00:00
Colin Cross
972e7ba893 Merge "Revert "Make installable arch-variant for cc modules"" 2021-10-29 18:10:59 +00:00
Colin Cross
545104bea1 Revert "Make installable arch-variant for cc modules"
Revert submission 1874144-native_bridge_libc_dup_rules

Reason for revert: breaks ndk_translation_all build
Reverted Changes:
I5379aa959:Make native bridge libc uninstallable
I2220d6b48:Remove BUILD_BROKEN_DUP_RULES from cuttlefish buil...
I8e0eaed21:Make installable arch-variant for cc modules

Bug: 204136549
Fixes: 204572444
Change-Id: I089a13675123a33a3ec3fea8eaa40c65fb2e5e59
2021-10-29 18:08:36 +00:00
Jiakai Zhang
65947f6fc4 Merge "Add a build-time check for dexpreopting system server jars." 2021-10-29 18:00:51 +00:00
Yi Kong
04e459d9ff Revert "Do not build tests with ThinLTO"
On second thought, this is actually counter-productive rather than an
optimisation. LTOing test code is usually quite cheap, however since
tests can pull in additional static libraries (e.g. to set up test
environment), we will have to create non-LTO variants for these
dependent libraries, which can be much more expensive.

This reverts commit 85d7297318.

Bug: 195134194
Bug: 203737712
Change-Id: I1a105136075133a5b5895d00847d8796c419964c
Test: m GLOBAL_THINLTO=true dist device-tests platform_tests
2021-10-29 17:53:27 +00:00
Paul Duffin
e9758b0415 Use toModule for all "standard" API surfaces
For the purposes of this change a standard API surface is one of the
following:
* public
* system
* test
* module-lib
* system-server

Test: m droid
Bug: 204189791
Change-Id: I88ee9709430ca455dd6c7d1523ae22f8c22b0b7e
2021-10-29 17:57:12 +01:00
Paul Duffin
132c3e61c0 Run TestClasspath test cases with Always_use_prebuilt_sdks=true/false
Previously, the TestClasspath test cases were only run with the default
setting of Always_use_prebuilt_sdks=false. That meant that some of the
code under test that depended on the setting of that variable was not
tested properly.

This change runs the test cases m with Always_use_prebuilt_sdks=true as
well. Those test cases whose behavior depends on the setting of that
variable are split into two separate test cases, each of which only
runs with the appropriate setting of that variable. All other test
cases are run for both settings of the variable.

That revealed a slight issue with the test setup (a missing
prebuilts/sdk/public/core/android.jar file) which broke the
core_current test when run with Always_use_prebuilt_sdks=true which has
also been fixed.

Bug: 204189791
Test: m nothing
Change-Id: If2ea3fde40c7573262e93691af0b5a57e4d54469
2021-10-29 17:57:12 +01:00
Paul Duffin
0b3b36a402 Refactor TestClasspath to simplify follow up change
Extracts classpathTestCase and extracts the logic for creating the test
into a separate testClasspathTestCases func.

Bug: 204189791
Test: m nothing
Change-Id: I657fbcde23a18f7f5651c174fbf17a9b7b7f1a9a
2021-10-29 17:57:12 +01:00
Paul Duffin
12e311d958 Add tests for prebuilts of all API surfaces
Previously, the tests only covered checking the sdk dependencies added
when using a prebuilt current (public) and system SDKs, i.e. with
sdk_version set to "current_30" or "system_30". This change adds tests
to cover other APIs, e.g. "test_30", "module_30" and
"system_server_30". It adds tests for "module" and "system-server" up
to API level 32 as following changes will give them different behavior
as API levels less than or equal to 31 do not have a separate
core-for-system-modules.jar file for the module-lib API.

Bug: 204189791
Test: m nothing
Change-Id: I585a88615439a24abf75250114a86113b5f5da57
2021-10-29 17:57:12 +01:00
Colin Cross
883b2d03d1 Merge "Make installable arch-variant for cc modules" am: f87065fedb am: 10f31785fa am: 1dc06ad960 am: 77450557b7 am: dffeb5dd25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874481

Change-Id: If252e5703f20f03446990f41c2ea846f89483849
2021-10-29 16:30:23 +00:00
Colin Cross
dffeb5dd25 Merge "Make installable arch-variant for cc modules" am: f87065fedb am: 10f31785fa am: 1dc06ad960 am: 77450557b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874481

Change-Id: Ieb3abbf12825df1129b62603dab96dbc5935c618
2021-10-29 16:10:56 +00:00
Colin Cross
77450557b7 Merge "Make installable arch-variant for cc modules" am: f87065fedb am: 10f31785fa am: 1dc06ad960
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874481

Change-Id: If000e2cab00d54312ff31f3b8c8dc67f736a2d3c
2021-10-29 15:54:56 +00:00
Colin Cross
1dc06ad960 Merge "Make installable arch-variant for cc modules" am: f87065fedb am: 10f31785fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874481

Change-Id: I610bfc478e69d9cbd19e59559699858048477b2d
2021-10-29 15:36:46 +00:00
Colin Cross
10f31785fa Merge "Make installable arch-variant for cc modules" am: f87065fedb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874481

Change-Id: I7bd7b0e4ed20604af1b104dbd748b5b19e2e7758
2021-10-29 15:19:04 +00:00
Colin Cross
f87065fedb Merge "Make installable arch-variant for cc modules" 2021-10-29 14:58:03 +00:00
Treehugger Robot
93b3834fec Merge "Remove MainNinjaFile()" am: 3bf5986bb3 am: 0dcc020ae4 am: 5cd602678b am: a4348b4928 am: 0a2be08f63
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874417

Change-Id: I5f2361e7e9426d88dea177e0ff7b838485bed916
2021-10-29 14:41:50 +00:00
Treehugger Robot
0a2be08f63 Merge "Remove MainNinjaFile()" am: 3bf5986bb3 am: 0dcc020ae4 am: 5cd602678b am: a4348b4928
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874417

Change-Id: I40bdaaad46eefe7bd7190bd4a04d1232cea41cf3
2021-10-29 14:29:31 +00:00
Treehugger Robot
a4348b4928 Merge "Remove MainNinjaFile()" am: 3bf5986bb3 am: 0dcc020ae4 am: 5cd602678b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874417

Change-Id: I3a867a753be40c066581ef3003090688d67221e4
2021-10-29 14:12:08 +00:00
Treehugger Robot
5cd602678b Merge "Remove MainNinjaFile()" am: 3bf5986bb3 am: 0dcc020ae4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874417

Change-Id: If10f5ef7b30e8288fbf60c7a910c0233ef16d319
2021-10-29 13:49:51 +00:00
Treehugger Robot
0dcc020ae4 Merge "Remove MainNinjaFile()" am: 3bf5986bb3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1874417

Change-Id: I00ca2e67995e5da1486165b897a46089314f3873
2021-10-29 13:26:31 +00:00
Treehugger Robot
3bf5986bb3 Merge "Remove MainNinjaFile()" 2021-10-29 13:12:00 +00:00