StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,709 Commits 1 Branch 0 Tags
6affb8f1eabe38349a765ec7c063969220f99f50
Commit Graph

53709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spandan Das
6affb8f1ea Merge "Set targetSdkVersion to 10000 iff a module is targeting an unreleased sdk" am: 2ee7ac02e7 am: a9938be03e am: c21325dd15 am: b04b40c2e0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1914977

Change-Id: I44fde0c605bb23da64128b89eccd34f5eda42243
 2021-12-10 01:32:01 +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
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
643f93911a Merge "Add test for performance testing" am: 8f3da38b70 am: d8db779bef am: 33ac643f68 am: 822400bb66 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1879796

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

Change-Id: Ia28ffd681f9f613fd8be8ac49e621da596cbf5c4
 2021-12-09 21:56:35 +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
6305dfbeac Merge "Set prebuiltCommon.installedFile for apex_set modules" am: 3c48297dde am: 8211f7f7b8 am: 3e21b79432 am: 10ae7770c7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915701

Change-Id: Ic9a9aebe1279986c4195bdf68771ab33afbcb7d1
 2021-12-09 19:43:11 +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
7dbffacde6 [automerger skipped] Merge changes from topics "presubmit-am-0a046d9514b34cc1a3b2b3584e857f6c", "presubmit-am-22410ea0b46e4a3d961d51518c65514d", "presubmit-am-2646dd78e751450296e76a7e6fac60eb", "presubmit-am-2762d254a366481180c66eefcb7b8c53", "presubmit-am-36ef44194069468da39e59065e3b9d39", "presubmit-am-6e59a6b21a5047bd940a9bff59c79228", "presubmit-am-855c4e732f2645568065c3c870ecd0da", "presubmit-am-dae9703bfd65425b8b44605c42e9d5b9" into sc-mainline-prod am: aa7b36e681 -s ours 
am skip reason: Merged-In I08ec0b4463a17bc8265b948fe09da55eb4e52ac3 with SHA-1 758968a700 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16431366

Change-Id: I6fafafda63605ed9d1d7d8b5d0dd49c395fb5868
 2021-12-09 16:08:21 +00:00
TreeHugger Robot
24d1fc8ef3 Merge "[automerged blank] Add ModuleWithMinSdkVersionCheck type. 2p: cb0977f67e" 2021-12-09 15:54:26 +00:00
TreeHugger Robot
aa7b36e681 Merge changes from topics "presubmit-am-0a046d9514b34cc1a3b2b3584e857f6c", "presubmit-am-22410ea0b46e4a3d961d51518c65514d", "presubmit-am-2646dd78e751450296e76a7e6fac60eb", "presubmit-am-2762d254a366481180c66eefcb7b8c53", "presubmit-am-36ef44194069468da39e59065e3b9d39", "presubmit-am-6e59a6b21a5047bd940a9bff59c79228", "presubmit-am-855c4e732f2645568065c3c870ecd0da", "presubmit-am-dae9703bfd65425b8b44605c42e9d5b9" into sc-mainline-prod 
* changes:
  Allow java_sdk_library in an APEX to have higher min_sdk_version.
  Perform CheckMinSdkVersion for java_sdk_library.
  Add MinSdkVersion(ctx) method to ModuleWithMinSdkVersionCheck interface.
  Add ModuleWithMinSdkVersionCheck type.
  Use textproto format for classpaths.proto generation.
  Propagate min and max sdk versions to classpaths.proto configs.
  Introduce max_sdk_version device property.
  Test SdkSpecForm.
 2021-12-09 15:54:26 +00:00
TreeHugger Robot
6d2884c336 Merge "[automerged blank] Test SdkSpecForm. 2p: fba70bc07f" 2021-12-09 15:54:26 +00:00
TreeHugger Robot
62105e82c5 Merge "[automerged blank] Introduce max_sdk_version device property. 2p: e9b63a8ae0" 2021-12-09 15:54:26 +00:00
TreeHugger Robot
e489494737 Merge changes from topic "presubmit-am-2762d254a366481180c66eefcb7b8c53" 
* changes:
  [automerged blank] Perform CheckMinSdkVersion for java_sdk_library. 2p: 531330e5ab
  Perform CheckMinSdkVersion for java_sdk_library.
 2021-12-09 15:54:26 +00:00
TreeHugger Robot
9318c3e3bd Merge changes from topics "presubmit-am-22410ea0b46e4a3d961d51518c65514d", "presubmit-am-6e59a6b21a5047bd940a9bff59c79228" 
* changes:
  [automerged blank] Add MinSdkVersion(ctx) method to ModuleWithMinSdkVersionCheck interface. 2p: 477a7baa79
  Add MinSdkVersion(ctx) method to ModuleWithMinSdkVersionCheck interface.
  Add ModuleWithMinSdkVersionCheck type.
 2021-12-09 15:54:26 +00:00
TreeHugger Robot
4a867d81da Merge "[automerged blank] Propagate min and max sdk versions to classpaths.proto configs. 2p: 747d1066bd" 2021-12-09 15:54:26 +00:00
satayev
9903aa746b [automerged blank] Add ModuleWithMinSdkVersionCheck type. 2p: cb0977f67e 
Blank merge reason: Change-Id Ia2fad6c52af39e21f65385bcb283f1e3adab5548 with SHA-1 b3fd411465 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16431363

Bug: 205923322
Change-Id: Ic54a61677d085c689cede3b08a4b594e28f6965f
 2021-12-09 14:37:02 +00:00
satayev
bb5646a15c [automerged blank] Test SdkSpecForm. 2p: fba70bc07f 
Blank merge reason: Change-Id Ib8cd891f03537712d709ed063dd76dee55221118 with SHA-1 0ee2f913ef is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16431359

Bug: 190818041
Change-Id: I4b4e327792d87ca1ebd7d0fe7897012c076e7abb
 2021-12-09 14:37:01 +00:00
satayev
0ce626b941 [automerged blank] Introduce max_sdk_version device property. 2p: e9b63a8ae0 
Blank merge reason: Change-Id I6985ebb671841cdd9f0f37f916267ac5ed76e4f4 with SHA-1 0a420e771a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16431360

Bug: 190818041
Change-Id: I602314fbdcd03990081ec704bd4a5f3ecb866a2c
 2021-12-09 14:37:01 +00:00
satayev
b9559ff150 [automerged blank] Perform CheckMinSdkVersion for java_sdk_library. 2p: 531330e5ab 
Blank merge reason: Change-Id I79b5a1fc34098fff60221e416db6e6e69e01f531 with SHA-1 8f088b09d8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16431365

Bug: 205923322
Change-Id: I4370ae597b8f6e42397d56d8d6144dbd3612e363
 2021-12-09 14:36:55 +00:00
satayev
ba04a3fa16 [automerged blank] Add MinSdkVersion(ctx) method to ModuleWithMinSdkVersionCheck interface. 2p: 477a7baa79 
Blank merge reason: Change-Id I469d655823e12a14bc0abaeb544a5dd2a6d3622f with SHA-1 ad99149a62 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16431364

Bug: 205923322
Change-Id: I2f41870c42fa699015de9ac6ef06d6eec1355feb
 2021-12-09 14:36:55 +00:00
satayev
4e7b39fbf7 [automerged blank] Propagate min and max sdk versions to classpaths.proto configs. 2p: 747d1066bd 
Blank merge reason: Change-Id Ieb9aef29657ad0694d48a63019f93faca2678252 with SHA-1 cca4ab762e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16431361

Bug: 190818041
Change-Id: Ica449a78c53819138ed4666cffb13b3d81f0e33c
 2021-12-09 14:36:53 +00:00
satayev
e23a09f870 [automerged blank] Use textproto format for classpaths.proto generation. 2p: 3f6bbd9d56 
Blank merge reason: Change-Id I3fea94153939f05329f02091ca4fa838ee9df93f with SHA-1 48dae67a76 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16431362

Change-Id: Ia4311a8fba346f015e3bd51d88e4f2c5aa689399
 2021-12-09 14:36:50 +00:00
satayev
812683ec25 Allow java_sdk_library in an APEX to have higher min_sdk_version. 
Inidividual boot or system server jars may have higher min_sdk_version
than the contianing apex, since the runtime respects the values of
min/max_sdk_version; e.g. runtime would not load a boot jar with
higher min_sdk_version. This allows shipping new boot jars via apexes
that target older platforms.

Bug: 190818041
Test: presubmit
Change-Id: I08ec0b4463a17bc8265b948fe09da55eb4e52ac3
Merged-In: I08ec0b4463a17bc8265b948fe09da55eb4e52ac3
(cherry picked from commit 758968a700)
 2021-12-09 14:35:32 +00:00
satayev
cb0977f67e Add ModuleWithMinSdkVersionCheck type. 
This is to help following refactor for individual modules to have their
own version of checking where needed.

For example, apk in apex may want to enforce it's own version of
CheckMinSdkVersion.

Bug: 205923322
Test: presubmit
Change-Id: Ia2fad6c52af39e21f65385bcb283f1e3adab5548
Merged-In: Ia2fad6c52af39e21f65385bcb283f1e3adab5548
(cherry picked from commit b3fd411465)
 2021-12-09 14:35:32 +00:00
satayev
fba70bc07f Test SdkSpecForm. 
Bug: 190818041
Test: presubmit
Change-Id: Ib8cd891f03537712d709ed063dd76dee55221118
Merged-In: Ib8cd891f03537712d709ed063dd76dee55221118
(cherry picked from commit 0ee2f913ef)
 2021-12-09 14:35:32 +00:00
satayev
e9b63a8ae0 Introduce max_sdk_version device property. 
Artifacts that go into apexes should only be active on certain SDK
versions. There is now a need to upper bound the range to support
expressiong statements like "this jar should only run on platforms
30-31".

Bug: 190818041
Test: presubmit
Change-Id: I6985ebb671841cdd9f0f37f916267ac5ed76e4f4
Merged-In: I6985ebb671841cdd9f0f37f916267ac5ed76e4f4
(cherry picked from commit 0a420e771a)
 2021-12-09 14:35:32 +00:00
satayev
531330e5ab Perform CheckMinSdkVersion for java_sdk_library. 
In a follow up, apex would expect that any module that implements
ModuleWithMinSdkVersionCheck to have performed appropate checks on
min_sdk_version, to allow relaxing some of the existing conditions.

This change moves the responsibility of checking min_sdk_version
of java_sdk_library to java_sdk_library itself.

Bug: 205923322
Test: presubmit
Change-Id: I79b5a1fc34098fff60221e416db6e6e69e01f531
Merged-In: I79b5a1fc34098fff60221e416db6e6e69e01f531
(cherry picked from commit 8f088b09d8)
 2021-12-09 14:35:32 +00:00
satayev
477a7baa79 Add MinSdkVersion(ctx) method to ModuleWithMinSdkVersionCheck interface. 
Bug: 205923322
Test: presubmit
Change-Id: I469d655823e12a14bc0abaeb544a5dd2a6d3622f
Merged-In: I469d655823e12a14bc0abaeb544a5dd2a6d3622f
(cherry picked from commit ad99149a62)
 2021-12-09 14:35:32 +00:00
satayev
747d1066bd Propagate min and max sdk versions to classpaths.proto configs. 
These attributed define a range for dessert releases where the jars
should be active, and included in corresponding CLASSPATH varibles by
derive_classpath.

Bug: 190818041
Test: presubmit
Change-Id: Ieb9aef29657ad0694d48a63019f93faca2678252
Merged-In: Ieb9aef29657ad0694d48a63019f93faca2678252
(cherry picked from commit cca4ab762e)
 2021-12-09 14:35:32 +00:00
satayev
3f6bbd9d56 Use textproto format for classpaths.proto generation. 
Test: presubmit
Change-Id: I3fea94153939f05329f02091ca4fa838ee9df93f
Merged-In: I3fea94153939f05329f02091ca4fa838ee9df93f
(cherry picked from commit 48dae67a76)
 2021-12-09 14:35:32 +00:00
Treehugger Robot
0621e6d216 Merge "Remove test_min_api_level property" am: ea8b7771f1 am: 39e3984e0d am: 3a32bdcf25 am: fd62f28d36 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1905090

Change-Id: I8b036f244cc2822c8431fad05274d72484a94765
 2021-12-09 07:10:33 +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
3e842104a6 Merge "Don't panic when DevicePrimaryArchType is called in a host only build" am: 9f5a9d1d54 am: 11f79516e2 am: 278415109a am: 0c631f19e9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1915495

Change-Id: I19b8de60658cf4bd164b3357c0125318e96645d5
 2021-12-09 05:29:54 +00:00