StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,075 Commits 1 Branch 0 Tags
b7246725cc53aa7c04d28e531e2521052d77528c
Commit Graph

44075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulyana Trafimovich
b7246725cc Merge "Refactor function to reduce nestedness level. No functional changes." am: 9cb1577ac7 am: de136dec72 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768130

Change-Id: I2ee712fb8768bb7086a78f538c536e93cc7063c4
 2021-07-16 10:12:30 +00:00
Ulyana Trafimovich
de136dec72 Merge "Refactor function to reduce nestedness level. No functional changes." am: 9cb1577ac7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768130

Change-Id: Iee12737d59c5529868543a9a0f61f0c1fc3c328f
 2021-07-16 09:56:22 +00:00
Ulyana Trafimovich
9cb1577ac7 Merge "Refactor function to reduce nestedness level. No functional changes." 2021-07-16 09:37:00 +00:00
Colin Cross
0369572907 Merge "Rename ninja variables with Clang in the name" am: 51736b82fc am: ac5a348ce9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767413

Change-Id: Ib314260932248c5f2d0ca0f2e567fa61eb91c1e2
 2021-07-16 01:06:04 +00:00
Colin Cross
ac5a348ce9 Merge "Rename ninja variables with Clang in the name" am: 51736b82fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767413

Change-Id: I897f6d3127ca841f06edac146a872a16c0336956
 2021-07-16 00:48:53 +00:00
Colin Cross
7a19faf969 Merge changes I29bf144b,Id2879453 am: 908fbe200e am: a103247992 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767412

Change-Id: Ib40d4dae318eb81f1bd04cd061af664cd4994238
 2021-07-16 00:30:14 +00:00
Colin Cross
51736b82fc Merge "Rename ninja variables with Clang in the name" 2021-07-16 00:28:13 +00:00
Colin Cross
a103247992 Merge changes I29bf144b,Id2879453 am: 908fbe200e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767412

Change-Id: Iaa0d26511b9028cd2593ca4992deb7f07fe4f50f
 2021-07-16 00:15:40 +00:00
Colin Cross
908fbe200e Merge changes I29bf144b,Id2879453 
* changes:
  Remove more clang indirection without affecting command lines
  Remove clang indirection without affecting build.ninja
 2021-07-16 00:00:22 +00:00
Liz Kammer
aa91cec9cb Merge "Add test to reproduce bug in error message." am: c07b16f49c am: 56008abd97 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768625

Change-Id: I8eebed1645018ec228c492152862b8046c87122f
 2021-07-15 21:45:42 +00:00
Liz Kammer
56008abd97 Merge "Add test to reproduce bug in error message." am: c07b16f49c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768625

Change-Id: Iee7c52b166bad9a0d1d0c8b7ef22cbd87fb74c39
 2021-07-15 21:26:43 +00:00
Liz Kammer
c07b16f49c Merge "Add test to reproduce bug in error message." 2021-07-15 20:37:52 +00:00
Martin Stjernholm
5d56d75dbe Merge "Document how APEXes are identified in the boot jar variables." am: 9fe17bc8d9 am: 337f8cc2f2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1756729

Change-Id: If1e5211ffd2f1cab1d6cc62d1058f8b64fbb2dd2
 2021-07-15 19:51:34 +00:00
Martin Stjernholm
337f8cc2f2 Merge "Document how APEXes are identified in the boot jar variables." am: 9fe17bc8d9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1756729

Change-Id: If0bd4088434367c4dcb7b3a768916fe609e140d3
 2021-07-15 19:33:34 +00:00
Martin Stjernholm
9fe17bc8d9 Merge "Document how APEXes are identified in the boot jar variables." 2021-07-15 18:57:00 +00:00
Liz Kammer
0fc1e134b9 Add test to reproduce bug in error message. 
soong config variable modules allow specifying a non-existent property,
which results in an unhelpful error message when the module type is then
used.

Bug: 171232169
Test: go test soong tests
Change-Id: I6174c0d35a28952157ee925f51d615e2ee735f8a
 2021-07-15 12:38:35 -04:00
Paul Duffin
dff1ccd9b9 Merge "Support fully qualified names in android:"path" properties" am: 9e3e9c905b am: bd01c983d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1761491

Change-Id: I60bd79a3293f3607c5f3856d0336567f6d1f2e34
 2021-07-15 16:32:11 +00:00
Paul Duffin
00e4527b43 [automerger skipped] Propagate permitted packages to sdk snapshot am: 7b3e10a1c2 -s ours 
am skip reason: Merged-In I4560987f746f78c0ae706058195b6db4bea438aa with SHA-1 869de147ab is already in history

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

Change-Id: Id02ac0126e7df6a94752631c2ad8b6cf561db61c
 2021-07-15 16:31:36 +00:00
Paul Duffin
bd01c983d3 Merge "Support fully qualified names in android:"path" properties" am: 9e3e9c905b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1761491

Change-Id: I23f53b86ff0380d92e15af22ba8f9d30959bbd0c
 2021-07-15 16:19:51 +00:00
Paul Duffin
9e3e9c905b Merge "Support fully qualified names in android:"path" properties" 2021-07-15 16:02:34 +00:00
Paul Duffin
cc7fc33e20 Merge "Build updatable-bcp-packages.txt from prebuilts in sdk snapshot" am: d2a23518b4 am: 3caa3a02ee 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768127

Change-Id: I0f1bd5d1a6d53d12f9af41b46af3453af24c0591
 2021-07-15 15:23:27 +00:00
Paul Duffin
2be643b605 Merge "Propagate permitted packages to sdk snapshot" am: 81d56dcd3f am: fcbeaa37a8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768128

Change-Id: I71487b6536f93a0dbbf121ff45f5737858f3d373
 2021-07-15 15:23:17 +00:00
Paul Duffin
3caa3a02ee Merge "Build updatable-bcp-packages.txt from prebuilts in sdk snapshot" am: d2a23518b4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768127

Change-Id: Icfd614f4ec1ae722e742cbf98eb58a2a71d09f1d
 2021-07-15 15:10:44 +00:00
Paul Duffin
fcbeaa37a8 Merge "Propagate permitted packages to sdk snapshot" am: 81d56dcd3f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768128

Change-Id: I0319ea86d5d966892a6b02c6a52100475306c056
 2021-07-15 15:10:38 +00:00
Paul Duffin
7b3e10a1c2 Propagate permitted packages to sdk snapshot 
Previously, permitted_packages were not copied to the sdk snapshot.
This change corrects that.

Bug: 193763688
Test: m nothing
      - Added unit tests, which all failed and then fixed the tests.
Merged-In: I4560987f746f78c0ae706058195b6db4bea438aa
Change-Id: I4560987f746f78c0ae706058195b6db4bea438aa
(cherry picked from commit 869de147ab)
 2021-07-15 16:00:11 +01:00
Paul Duffin
d2a23518b4 Merge "Build updatable-bcp-packages.txt from prebuilts in sdk snapshot" 2021-07-15 14:58:12 +00:00
Paul Duffin
81d56dcd3f Merge "Propagate permitted packages to sdk snapshot" 2021-07-15 14:58:03 +00:00
satayev
4619a2bdd5 Merge "Update a comment about PRODUCT_UPDATABLE_BOOT_JARS." am: 1180b1fc4a am: 8ed574e839 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768126

Change-Id: I3b36e57d068a35902c256bf84b3150f435031103
 2021-07-15 14:33:25 +00:00
Ulya Trafimovich
2444671b4a Refactor function to reduce nestedness level. No functional changes. 
Bug: 193425964
Test: m nothing
Change-Id: Ic2d20eb5317f397919ecb01b64c5dd0da78e4a1a
 2021-07-15 15:18:25 +01:00
satayev
8ed574e839 Merge "Update a comment about PRODUCT_UPDATABLE_BOOT_JARS." am: 1180b1fc4a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768126

Change-Id: Ia6ef4362685a21790d926c6e749e7ea343ce873e
 2021-07-15 14:15:31 +00:00
satayev
1180b1fc4a Merge "Update a comment about PRODUCT_UPDATABLE_BOOT_JARS." 2021-07-15 14:01:38 +00:00
Liz Kammer
a61eb1ef15 Merge "Include bazel-status of build in metrics" am: da29c65eb6 am: 7bce37e093 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1766626

Change-Id: Idfabd2ddef04edd822ea236615adb3ff2480cef2
 2021-07-15 13:30:17 +00:00
Paul Duffin
630b11e9d4 Build updatable-bcp-packages.txt from prebuilts in sdk snapshot 
Previously, the java_import and java_sdk_library_import modules did not
make their permitted_packages available to the rule that generates the
updatable-bcp-packages.txt file. This change corrects that.

Bug: 193763688
Test: m nothing
      - Added unit tests, which all failed and then fixed the tests.
Change-Id: If0706e4551a331b48d383123088e63924dded48b
 2021-07-15 14:16:44 +01:00
Liz Kammer
7bce37e093 Merge "Include bazel-status of build in metrics" am: da29c65eb6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1766626

Change-Id: I3452f7976a18fbc85eb47cabe701b0b3260c0b3b
 2021-07-15 13:16:30 +00:00
Paul Duffin
869de147ab Propagate permitted packages to sdk snapshot 
Previously, permitted_packages were not copied to the sdk snapshot.
This change corrects that.

Bug: 193763688
Test: m nothing
      - Added unit tests, which all failed and then fixed the tests.
Change-Id: I4560987f746f78c0ae706058195b6db4bea438aa
 2021-07-15 14:15:58 +01:00
Liz Kammer
da29c65eb6 Merge "Include bazel-status of build in metrics" 2021-07-15 12:58:04 +00:00
satayev
f208a5766e Update a comment about PRODUCT_UPDATABLE_BOOT_JARS. 
Bug: 191127295
Test: n/a
Change-Id: I3d8e8689a79be79714b01cfd8abac34e7d963aee
 2021-07-15 13:22:31 +01:00
Treehugger Robot
55ac43fbd5 Merge "Update comment text of SrcIsModuleWithTag()" am: f6ecb09322 am: bb3206b0eb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767845

Change-Id: If85eca8820df23e25d7710f1d0bbf42dfa2209da
 2021-07-15 12:06:55 +00:00
Treehugger Robot
bb3206b0eb Merge "Update comment text of SrcIsModuleWithTag()" am: f6ecb09322 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1767845

Change-Id: Idecc8d9544b5095510903b146f490a410abf39dd
 2021-07-15 11:40:19 +00:00
Treehugger Robot
f6ecb09322 Merge "Update comment text of SrcIsModuleWithTag()" 2021-07-15 11:24:19 +00:00
Ulya Trafimovich
0177d33204 [automerger skipped] Drop "prebuilt_" prefix when adding libraries to class loader context. am: fa20b187dc -s ours 
am skip reason: Merged-In Icc42533d9915060d7fffda12aa93b9d18dc4f83d with SHA-1 69c1aa94ac is already in history

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

Change-Id: Ib8ba003025ad28fe70275d5041ae4a9017b46f94
 2021-07-15 11:15:04 +00:00
Ulyana Trafimovich
7af46fabf6 Merge "Drop "prebuilt_" prefix when adding libraries to class loader context." am: bd14f9a952 am: d47262c529 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765982

Change-Id: Iac7a5b0a7a975b641e3b589915a5915f26d3418d
 2021-07-15 10:50:24 +00:00
Ulyana Trafimovich
732d7c431a Merge "Drop strings.HasPrefix when guarding strings.TrimPrefix." am: 7beb099546 am: cdaf15d04f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765983

Change-Id: Ie6342e568e443a13eb840afb218dbb5a3931467d
 2021-07-15 10:50:16 +00:00
Ulyana Trafimovich
d47262c529 Merge "Drop "prebuilt_" prefix when adding libraries to class loader context." am: bd14f9a952 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765982

Change-Id: Ic6459e82ac8cd6ddc8aadfe79212a456b4eb847e
 2021-07-15 10:26:58 +00:00
Ulyana Trafimovich
cdaf15d04f Merge "Drop strings.HasPrefix when guarding strings.TrimPrefix." am: 7beb099546 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765983

Change-Id: Ia1ddb9ca2404e369ab2f2352ccb653bf045fe2fe
 2021-07-15 10:26:51 +00:00
Ulya Trafimovich
fa20b187dc Drop "prebuilt_" prefix when adding libraries to class loader context. 
This is needed when some source libraries get replaced with prebuilt
variants: CLC should contain one entry for a library (the prebuilt one
or the source one, whichever of them is preferred). Because the prebuilt
module name starts with "prebuilt_" prefix, previously Soong considered
such libraries as two different ones libraries and added both to CLC.

Bug: 193425964

Test: mark "prebuilt_android.net.ipsec.ike" as preferred and `m nothing`
      (before this CL it would fail the build, now it builds fine).

Test: $ lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd
      $ adb wait-for-device && \
        adb root && \
        adb logcat | \
        grep -E 'ClassLoaderContext [a-z ]+ mismatch' -C 1
      # empty output, no errors
Change-Id: Icc42533d9915060d7fffda12aa93b9d18dc4f83d
Merged-In: Icc42533d9915060d7fffda12aa93b9d18dc4f83d
(cherry picked from commit 69c1aa94ac)
 2021-07-15 11:17:24 +01:00
Ulyana Trafimovich
bd14f9a952 Merge "Drop "prebuilt_" prefix when adding libraries to class loader context." 2021-07-15 10:15:44 +00:00
Ulyana Trafimovich
7beb099546 Merge "Drop strings.HasPrefix when guarding strings.TrimPrefix." 2021-07-15 10:15:26 +00:00
Paul Duffin
b4632e545a Merge "Support generating sdk snapshots that can be selected by Soong config vars" am: 4e444dab84 am: 07a807151e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1762229

Change-Id: I80b13f39e390fba110de305c9b84902ff386e341
 2021-07-15 09:29:51 +00:00
Treehugger Robot
a5d5782e39 Merge "dexpreopt.config should be created even though unbundled image is built" am: 75d719fdd7 am: 1bc89a7af1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730112

Change-Id: I4e91d1b293e84c69f032e148931357e2a050e10f
 2021-07-15 09:28:40 +00:00