StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,874 Commits 1 Branch 0 Tags
b04b40c2e07d04d6b47ae1a19d528ae36f2aef4b
Commit Graph

48874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Spandan Das
2ee7ac02e7 Merge "Set targetSdkVersion to 10000 iff a module is targeting an unreleased sdk" 2021-12-09 23:56:37 +00: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
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
Colin Cross
11f79516e2 Merge "Don't panic when DevicePrimaryArchType is called in a host only build" am: 9f5a9d1d54 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915495

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

Change-Id: I1b40aec433478d0ddf3342e2727b19b566e8a088
 2021-12-09 04:30:38 +00:00
Colin Cross
9f5a9d1d54 Merge "Don't panic when DevicePrimaryArchType is called in a host only build" 2021-12-09 04:18:17 +00:00
Treehugger Robot
c0bd6986e5 Merge changes I5ba5e518,Icdf30c4d 
* changes:
  Handle substitution references in mk2rbc
  Support if expressions in mk2rbc
 2021-12-09 04:12:32 +00:00
Dan Willemsen
aa967536d7 Support macOS 12 SDK am: e3d50bfba9 am: d4105fcf60 am: 3452b082de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914488

Change-Id: Ibe9f564d223b0c036d87d01110212cca1cb4a9fb
 2021-12-09 01:51:06 +00:00
Dan Willemsen
3452b082de Support macOS 12 SDK am: e3d50bfba9 am: d4105fcf60 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914488

Change-Id: I3576364c2df76048c9e5616bd5960deb3eaaedfe
 2021-12-09 01:34:45 +00:00
Cole Faust
c36c962670 Handle substitution references in mk2rbc 
Bug: 201700692
Test: go test
Change-Id: I5ba5e51848e795e39f1f65dc153e4c1530066860
 2021-12-08 17:32:57 -08:00
Dan Willemsen
d4105fcf60 Support macOS 12 SDK am: e3d50bfba9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914488

Change-Id: Ic9151d4925c9671684dfb7eb3ddeea3c9d6adb1b
 2021-12-09 01:18:51 +00:00
Justin Yun
d396515482 Remove test_min_api_level property 
Replace the test_min_api_level property with
test_options.min_shipping_api_level.

Bug: 187258404
Test: build
Change-Id: Ifbac62f389226ed690f0ec03b9cc0845132ae885
 2021-12-09 00:16:41 +00:00
Colin Cross
c53c37fad1 Don't panic when DevicePrimaryArchType is called in a host only build 
Check the length of c.Targets[Android] before getting the first
element, and return Common if the length is set.  Fixes a panic
when a tradefed_binary is defined in a host-only build.

Test: aosp-build-tools build
Change-Id: I89f1dd13aa1aff5eb7d39e0b66eeedcb7d930fa0
 2021-12-08 15:42:22 -08:00
Dan Willemsen
4d913d8528 Merge "Add Darwin x86_64+arm64 universal binary support" am: ce69757379 am: 1bd7543d6e am: b2a6b903fb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1884611

Change-Id: I106219bd0af5ba1ef0f8f96a71f3026d4b8eb07c
 2021-12-08 23:38:45 +00:00
Christopher Parsons
f0ff963797 Merge "Print number of converted modules" am: 212df74a32 am: 3d8018643c am: 604dc6b6e5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913917

Change-Id: I90b18945d7b7a68889ebbf57ba97ff6824584e1a
 2021-12-08 23:38:23 +00:00
Dan Willemsen
b2a6b903fb Merge "Add Darwin x86_64+arm64 universal binary support" am: ce69757379 am: 1bd7543d6e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1884611

Change-Id: I6b0bc21a57b9508eff751646d40215a36f0d8adf
 2021-12-08 23:18:52 +00:00
Christopher Parsons
604dc6b6e5 Merge "Print number of converted modules" am: 212df74a32 am: 3d8018643c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913917

Change-Id: Ic9b339fe80dd2994a1569ce1ee0beaacb14b9e5f
 2021-12-08 23:18:27 +00:00
Usta
fe201fe158 The type assertion of DefaultableModule as Module is redundant 
Test: m nothing
Bug: n/a

Change-Id: I5f7eea47a2f2bc81a0a5b9314e6a452c38226067
 2021-12-08 18:03:23 -05:00
Dan Willemsen
1bd7543d6e Merge "Add Darwin x86_64+arm64 universal binary support" am: ce69757379 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1884611

Change-Id: I54226fc10b6e7265c9378df3e9634c793a61a12e
 2021-12-08 22:59:34 +00:00
Christopher Parsons
3d8018643c Merge "Print number of converted modules" am: 212df74a32 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913917

Change-Id: I39bf688e7a9a8922b41c193654effc289d39568f
 2021-12-08 22:58:36 +00:00
Dan Willemsen
e3d50bfba9 Support macOS 12 SDK 
Test: build w/Xcode 13.1
Change-Id: I9062b8045c4b02551aeeff06f4d7416c766e53a6
 2021-12-08 22:12:49 +00:00
Dan Willemsen
ce69757379 Merge "Add Darwin x86_64+arm64 universal binary support" 2021-12-08 21:08:43 +00:00
Christopher Parsons
212df74a32 Merge "Print number of converted modules" 2021-12-08 18:48:51 +00:00
Yuntao Xu
6c4e21d793 Merge "Add tests for converting license in androidmk" am: ab9f3a2bc5 am: 139c0dd6db am: 17b8748526 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1900000

Change-Id: Ief00d23e98b7a8eedc4c7222e8d7b17ea0785257
 2021-12-08 18:45:20 +00:00
Treehugger Robot
a0b46c1d06 Merge changes I08ec0b44,I79b5a1fc,I469d6558 am: 6abfb33784 am: 3bcefabfeb am: dc2accaba0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1907862

Change-Id: I189da72fe127e9717b2dc5e357f37263959d23a6
 2021-12-08 18:45:10 +00:00
Allen Hair
35a5252566 Merge "Revert "Set targetsdkversion to future level if TARGET_BUILD_APPS is not empty"" am: 9df0fa5e63 am: 952ebe85f0 am: aa5dbef9d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914027

Change-Id: Ieb6b27f325ac7b6a8e3ac72c47132531cbaedae8
 2021-12-08 18:44:34 +00:00
Yuntao Xu
17b8748526 Merge "Add tests for converting license in androidmk" am: ab9f3a2bc5 am: 139c0dd6db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1900000

Change-Id: Ib1906dfe6b8adfe4d0c5c472192b531d73efe37a
 2021-12-08 18:28:33 +00:00