Commit Graph

48902 Commits

Author SHA1 Message Date
Colin Cross
2904cf5cfc Build license metadata files in Soong am: 3dd2ff28ed am: 05ff6289c2 am: a25d6989dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899702

Change-Id: I1f39f285d2472c610077cca8175da7c6bed73864
2021-12-10 22:42:21 +00:00
Colin Cross
988e14cc4b Escape Host*Variable contents am: 1c35f243c5 am: 72d35eb0a5 am: 1e3709131f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915494

Change-Id: If504de76766aad0e13eafee6342567ad39e22d55
2021-12-10 22:42:17 +00:00
Colin Cross
a25d6989dc Build license metadata files in Soong am: 3dd2ff28ed am: 05ff6289c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899702

Change-Id: I2d470268f9d80ef6ef4164e297b67d9523f9e68e
2021-12-10 22:25:05 +00:00
Colin Cross
1e3709131f Escape Host*Variable contents am: 1c35f243c5 am: 72d35eb0a5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915494

Change-Id: I54f79d0eba2d1e54f1346199789c8c1f1fc5ba58
2021-12-10 22:20:38 +00:00
Colin Cross
05ff6289c2 Build license metadata files in Soong am: 3dd2ff28ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1899702

Change-Id: I96620d254f43dd9e8cfe02d1ed1dbc201c9cd381
2021-12-10 22:04:43 +00:00
Colin Cross
72d35eb0a5 Escape Host*Variable contents am: 1c35f243c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915494

Change-Id: I78a98453a932c7cace65bfaf0c2d39a2469342e6
2021-12-10 22:04:40 +00:00
Sorin Basca
73b1de9cd2 Merge "Adding experimental option to target Java 11" am: eb59a6d3ea am: 2aabb8de52 am: c6a840e45d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904231

Change-Id: I4e9f4476487af326b7f392be62a0d35ab2318a06
2021-12-10 14:57:50 +00:00
Sorin Basca
c6a840e45d Merge "Adding experimental option to target Java 11" am: eb59a6d3ea am: 2aabb8de52
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904231

Change-Id: Ifda6562f4b8ea922f2bb64e739e03ad3a023166d
2021-12-10 14:44:04 +00:00
Sorin Basca
2aabb8de52 Merge "Adding experimental option to target Java 11" am: eb59a6d3ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1904231

Change-Id: I0f2cf1d6dbfe020e906260978c9395b669f94032
2021-12-10 14:21:25 +00:00
Sorin Basca
eb59a6d3ea Merge "Adding experimental option to target Java 11" 2021-12-10 13:57:51 +00:00
Inseob Kim
d788455703 Merge "Add BoardPlatVendorPolicy to soong config" am: fcaea66933 am: 8bc61f24aa am: 656ba20a64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913480

Change-Id: I820344c7b60a61924324c64e8ac4169a44a0c779
2021-12-10 13:03:08 +00:00
Inseob Kim
656ba20a64 Merge "Add BoardPlatVendorPolicy to soong config" am: fcaea66933 am: 8bc61f24aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913480

Change-Id: Ib6ec0e3ea9b1a6b7be44d77f89224d01a4d146ef
2021-12-10 12:50:56 +00:00
Inseob Kim
8bc61f24aa Merge "Add BoardPlatVendorPolicy to soong config" am: fcaea66933
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913480

Change-Id: I882ab7fa943f53edf0a7fe0dea603bff25662f18
2021-12-10 12:29:48 +00:00
Inseob Kim
fcaea66933 Merge "Add BoardPlatVendorPolicy to soong config" 2021-12-10 12:13:36 +00:00
Treehugger Robot
33ea913c3b Merge "Replace Rust global arg with more legible alternative" am: 10fed2697e am: 25f3ae24eb am: a32ad78c95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917677

Change-Id: I50925b87ebf31617d596b89078ef5bf3a14632b4
2021-12-10 03:31:38 +00:00
Treehugger Robot
a32ad78c95 Merge "Replace Rust global arg with more legible alternative" am: 10fed2697e am: 25f3ae24eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917677

Change-Id: I80a34a9ba2f51c31de45d6d06b8f1c61b7e12d3c
2021-12-10 03:18:49 +00:00
Treehugger Robot
25f3ae24eb Merge "Replace Rust global arg with more legible alternative" am: 10fed2697e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1917677

Change-Id: Ia1fb52fdff5f073c34ca7e5aec0ddc6a8e3f57a2
2021-12-10 03:01:23 +00:00
Treehugger Robot
10fed2697e Merge "Replace Rust global arg with more legible alternative" 2021-12-10 02:44:21 +00:00
Remi NGUYEN VAN
4f2a9cb427 Merge "Relax apex package restriction for T+ jars" am: 4d5cd1f267 am: b68677917b am: 5d704c695e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908871

Change-Id: Ia865d38f8ac71ce208d1452e39ac0c222a982ce2
2021-12-10 01:03:20 +00:00
Spandan Das
b04b40c2e0 Merge "Set targetSdkVersion to 10000 iff a module is targeting an unreleased sdk" am: 2ee7ac02e7 am: a9938be03e am: c21325dd15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914977

Change-Id: I52e85b84618279879e2f3175374d0f15a8fc1bf3
2021-12-10 01:03:08 +00:00
Remi NGUYEN VAN
5d704c695e Merge "Relax apex package restriction for T+ jars" am: 4d5cd1f267 am: b68677917b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908871

Change-Id: Iabf16ba0db6710c21465605c58632a9baff4da19
2021-12-10 00:41:22 +00:00
Spandan Das
c21325dd15 Merge "Set targetSdkVersion to 10000 iff a module is targeting an unreleased sdk" am: 2ee7ac02e7 am: a9938be03e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914977

Change-Id: Ic02fee8065f1362d2b663cdcb491240723d24e65
2021-12-10 00:41:12 +00:00
Remi NGUYEN VAN
b68677917b Merge "Relax apex package restriction for T+ jars" am: 4d5cd1f267
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1908871

Change-Id: Ie5385ce14e712ab5c74954d1ce9c56f25bbb5df2
2021-12-10 00:17:57 +00:00
Spandan Das
a9938be03e Merge "Set targetSdkVersion to 10000 iff a module is targeting an unreleased sdk" am: 2ee7ac02e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914977

Change-Id: I163ddc446e92e825d3772e83c0e7da8f4ea7c236
2021-12-10 00:17:47 +00:00
Remi NGUYEN VAN
4d5cd1f267 Merge "Relax apex package restriction for T+ jars" 2021-12-10 00:15:17 +00:00
Spandan Das
2ee7ac02e7 Merge "Set targetSdkVersion to 10000 iff a module is targeting an unreleased sdk" 2021-12-09 23:56:37 +00:00
Chris Wailes
bc62193c7f Replace Rust global arg with more legible alternative
Bug: 201431719
Test: m rust
Change-Id: I5e0fae74e1df02f059ddcfa004b29059126a52e0
2021-12-09 13:56:32 -08:00
Liz Kammer
822400bb66 Merge "Add test for performance testing" am: 8f3da38b70 am: d8db779bef am: 33ac643f68
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879796

Change-Id: I08cfab4a3adeb6ce87c32c6524c361e3ab5a5b74
2021-12-09 21:42:00 +00:00
Treehugger Robot
c7c251787c Merge "The type assertion of DefaultableModule as Module is redundant Test: m nothing Bug: n/a" am: 37dd05bbbe am: 1bc4f14604 am: d640edaf69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914978

Change-Id: I3ffa0d2eb73f74ff7592a86dcf4b8f02288ce699
2021-12-09 21:39:40 +00:00
Liz Kammer
33ac643f68 Merge "Add test for performance testing" am: 8f3da38b70 am: d8db779bef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879796

Change-Id: Ie689dcb3bb97261593174132b6ef6593ab564576
2021-12-09 21:25:02 +00:00
Treehugger Robot
d640edaf69 Merge "The type assertion of DefaultableModule as Module is redundant Test: m nothing Bug: n/a" am: 37dd05bbbe am: 1bc4f14604
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914978

Change-Id: If9992dc3e96cc61eb42c42d7b7ba03375f43d830
2021-12-09 21:23:49 +00:00
Liz Kammer
d8db779bef Merge "Add test for performance testing" am: 8f3da38b70
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879796

Change-Id: I484a0df80ecfe0131c4a07b13d23082be8822204
2021-12-09 20:50:41 +00:00
Treehugger Robot
1bc4f14604 Merge "The type assertion of DefaultableModule as Module is redundant Test: m nothing Bug: n/a" am: 37dd05bbbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914978

Change-Id: If2dae08811d14d8a549c90a922970b07bf5ab935
2021-12-09 20:49:12 +00:00
Liz Kammer
8f3da38b70 Merge "Add test for performance testing" 2021-12-09 20:46:56 +00:00
Treehugger Robot
37dd05bbbe Merge "The type assertion of DefaultableModule as Module is redundant Test: m nothing Bug: n/a" 2021-12-09 20:02:24 +00:00
Colin Cross
10ae7770c7 Merge "Set prebuiltCommon.installedFile for apex_set modules" am: 3c48297dde am: 8211f7f7b8 am: 3e21b79432
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915701

Change-Id: I5e3dcd4a07cc6792ef7b308aa951fc13819a01a9
2021-12-09 19:15:55 +00:00
Colin Cross
3e21b79432 Merge "Set prebuiltCommon.installedFile for apex_set modules" am: 3c48297dde am: 8211f7f7b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915701

Change-Id: I8a668a600070329a9e21a20d5a41cdb190620cef
2021-12-09 19:01:44 +00:00
Colin Cross
8211f7f7b8 Merge "Set prebuiltCommon.installedFile for apex_set modules" am: 3c48297dde
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915701

Change-Id: I1a13a7b722ead7c80bde100a4ce20d2a47b97c25
2021-12-09 18:38:51 +00:00
Spandan Das
c8cb0c3eb5 Set targetSdkVersion to 10000 iff a module is targeting an unreleased
sdk

Previously in aosp/1907152, targetSdkVersion for all modules would be
10000 in release builds. This would cause sdk compatibility errors like
b/209301265#3 for modules that were targeting a released SDK

This CL adds an additional check to set targetSdkVersion to 10000 only
if a module's apilevel is in preview (i.e. unreleased SDK)

Bug: 209301265

Test: Built various apk combinations locally, and used aapt2 to check
targetSdkVersion
Test: TARGET_BUILD_APPS=xyz m CaptivePortalLoginTests #
targetSdkVersion: 30
Test: m CaptivePortalLoginTests #targetSdkVersion: 30
Test: (internal) TARGET_BUILD_APPS=xyz m MediaProviderGoogle #
targetSdkVersion: 10000
Test: (internal) m MediaProviderGoogle #targetSdkVersion: Tiramisu

Change-Id: Id2901f23d4e1b436f8906940e47edd606a93657d
2021-12-09 18:08:28 +00:00
Colin Cross
3c48297dde Merge "Set prebuiltCommon.installedFile for apex_set modules" 2021-12-09 18:06:36 +00:00
Remi NGUYEN VAN
1fdd6ca88a Relax apex package restriction for T+ jars
The ART AOT exemption only applies to Q/R/S, so module jars that have
min_sdk T+ do not need to follow the module package restriction, even if
they are part of a Q/R/S module (but not loaded on Q/R/S).

Relax the restriction to only apply to jars that have min_sdk before T.

Bug: 208773835
Test: m (runs apex tests)
Change-Id: I2c3ad8984ca05ad763bf6162bd478f93ab4ee650
2021-12-09 18:28:47 +09:00
Treehugger Robot
fd62f28d36 Merge "Remove test_min_api_level property" am: ea8b7771f1 am: 39e3984e0d am: 3a32bdcf25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1905090

Change-Id: I5cbe1f6217b0061719271ee2ac4b9185035eed6c
2021-12-09 06:52:28 +00:00
Treehugger Robot
3a32bdcf25 Merge "Remove test_min_api_level property" am: ea8b7771f1 am: 39e3984e0d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1905090

Change-Id: Ic165a9d5805050e37657dfd1cf198f4fc083d0c7
2021-12-09 06:29:51 +00:00
Treehugger Robot
39e3984e0d Merge "Remove test_min_api_level property" am: ea8b7771f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1905090

Change-Id: I99b7c13ab9456fecab95e8f3fbe754000babc2a4
2021-12-09 06:06:51 +00:00
Treehugger Robot
ea8b7771f1 Merge "Remove test_min_api_level property" 2021-12-09 05:51:25 +00:00
Colin Cross
730e3f6139 Set prebuiltCommon.installedFile for apex_set modules
apex_set modules failed to set prebuiltCommon.installedFile, which
caused LOCAL_SOONG_INSTALLED_MODULE to be empty and base_rules.mk
to create a duplicate install rule.  Set it to the path to the
apex file installed by Soong.

Bug: 204136549
Bug: 209867137
Test: m SOONG_CONFIG_art_module_source_build=false
Change-Id: Ia7fec09598823343242ebd44f1732e6bba21d027
2021-12-09 05:24:15 +00:00
Colin Cross
0c631f19e9 Merge "Don't panic when DevicePrimaryArchType is called in a host only build" am: 9f5a9d1d54 am: 11f79516e2 am: 278415109a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915495

Change-Id: I08b50779360189f4cd979369386a016c890345cd
2021-12-09 05:11:56 +00:00
Treehugger Robot
c093606621 Merge changes I5ba5e518,Icdf30c4d am: c0bd6986e5 am: da20b5d233 am: d98848f6ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914033

Change-Id: I822d90397d2849a9f43c2e79c68f6078d9efeec9
2021-12-09 05:11:44 +00:00
Colin Cross
278415109a Merge "Don't panic when DevicePrimaryArchType is called in a host only build" am: 9f5a9d1d54 am: 11f79516e2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915495

Change-Id: I95d0da7bb0db8455a5ced458c9dc53bdce01fdbf
2021-12-09 04:52:52 +00:00
Treehugger Robot
d98848f6ba Merge changes I5ba5e518,Icdf30c4d am: c0bd6986e5 am: da20b5d233
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914033

Change-Id: If93ece6e260369233d1e54b67c9d4d5221111296
2021-12-09 04:52:20 +00:00