StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,864 Commits 1 Branch 0 Tags
fbaad8dc50d88fd99d3a14d91ff92c681dfbe522
Commit Graph

66864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zi Wang
fbaad8dc50 Merge "Incorporate Bazel-built fingerprint file into mixed builds" into udc-dev 2023-03-07 23:32:17 +00:00
Zi Wang
76889ce00a Incorporate Bazel-built fingerprint file into mixed builds 
Test: m and TH

Bug: 268337233
Ignore-AOSP-First: merge conflict resolutions
Change-Id: Ib2f7fa35b2d94972869e8e85be47b288ff875408
 2023-03-07 13:34:02 -08:00
Paul Duffin
69e72e5fb0 [automerger skipped] java_sdk_library_import: Copy all prebuilt properties to child modules am: 8ab8056a4f -s ours am: a8026df5c4 -s ours 
am skip reason: Merged-In I5719c257f8457bcb2238bc7965215512a20f1095 with SHA-1 bf4de041de is already in history

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

Change-Id: I2773e504bfa85ec23b09d6a83d0a13ac98b45b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:29:07 +00:00
Treehugger Robot
dc586b0704 Merge "Revert "Produce _alwayslink sibling targets through bp2build"" am: 88e949945d am: bcd1a67e48 am: e36875e7d2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2473786

Change-Id: I4cb230b9e1a57a192257f239e32b296d4d29c73e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:25:03 +00:00
Wei Li
ea1c8bd414 Export Soong module type to LOCAL_SOONG_MODULE_TYPE to Make for SBOM generation. am: 598f92d704 am: 261721421f am: 13d1319456 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374715

Change-Id: I97bdbaed3fd5df6411f7817c18c972ccc25bb6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:21:44 +00:00
Liz Kammer
f253f40ca0 Merge "Migrate overlapping config var defs in all bp file" am: edec71adae am: ebe523c177 am: b808a83319 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2472144

Change-Id: I5601044d5a8334b4c0bd21706d3ca277ade2d75c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:14:21 +00:00
Alix Espino
b0b1af3b18 Merge changes from topic "ktResourceStrip" am: 09907dab55 am: 956e77d412 am: f0dcf6eec7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470481

Change-Id: I95dc8e8f8c60dc8e0ef268b0f5a1385d46948a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:44:05 +00:00
Alix
33cbf2d461 resource_strip_prefix support for kotlin srcs am: 4d56abf937 am: 9ba68b0ba3 am: 6722869b6c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470480

Change-Id: I5421779dd471cfc592b75fe418bb9fd2f0cca903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:44:01 +00:00
Treehugger Robot
5e82dd0f80 Merge "conv_linker_config proto works with empty input" am: 6bc5e2cefa am: f432b44ddd am: 4800985881 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470881

Change-Id: I51719fa2004695a27c5ce3c365dde5ffe6483ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:33:40 +00:00
Treehugger Robot
934ae08220 Merge "soong: Add Cortex-A32 definitions" am: 80ebd72995 am: 5963f06818 am: 8ab4bf80f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470067

Change-Id: I512f3b9b0a7febd27cc15a24f0d574d1c78dee9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:33:22 +00:00
Zi Wang
9dfd95f0c9 Merge "Allowlist merged_txts dependencies and combined_apis type" am: 1841e5d023 am: 1bc028dbc0 am: 12c62fc748 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2439360

Change-Id: I434d881abe8aa6741922f9d094b62f062169ed59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:27:23 +00:00
Paul Duffin
a8026df5c4 [automerger skipped] java_sdk_library_import: Copy all prebuilt properties to child modules am: 8ab8056a4f -s ours 
am skip reason: Merged-In I5719c257f8457bcb2238bc7965215512a20f1095 with SHA-1 bf4de041de is already in history

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

Change-Id: I3d57293d82279bf932386bde5a937183c5ea361a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 15:56:12 +00:00
Paul Duffin
8ab8056a4f java_sdk_library_import: Copy all prebuilt properties to child modules 
Previously, only the prefer property was copied from the
java_sdk_library_import module to its child modules which meant that if
the use_source_config_var property was used to control the prefer
property that the child modules would never be used. That can cause
build breakages when building against prebuilts as some parts of the
build will use prebuilt files from java_sdk_library_import and some
will use source files from the corresponding java_sdk_library.

This change copies the use_source_config_var property too.

It also adds tests to verify that dependencies on child modules of a
java_sdk_library use the prebuilt child modules of the corresponding
java_sdk_library_import. That revealed a bug with the handling of stub
sources where the prefer property was set after creating the module
which has also been fixed.

Bug: 249192297
Test: m nothing
      # Cherry pick into branch broken by previous behavior and make
      # sure that it fixes it.
Change-Id: I5719c257f8457bcb2238bc7965215512a20f1095
(cherry picked from commit on android-review.googlesource.com host: bf4de041de)
Merged-In: I5719c257f8457bcb2238bc7965215512a20f1095
 2023-03-07 13:33:44 +00:00
Treehugger Robot
e36875e7d2 Merge "Revert "Produce _alwayslink sibling targets through bp2build"" am: 88e949945d am: bcd1a67e48 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2473786

Change-Id: Ica0b5edd9d1fbd6fa4f93c647ed09352216ac11b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 08:22:27 +00:00
Treehugger Robot
bcd1a67e48 Merge "Revert "Produce _alwayslink sibling targets through bp2build"" am: 88e949945d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2473786

Change-Id: Ia1825f2ca8d101a734b2fa680408c0a6891784fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 07:48:51 +00:00
Treehugger Robot
88e949945d Merge "Revert "Produce _alwayslink sibling targets through bp2build"" 2023-03-07 07:33:16 +00:00
Wilson Sung
68e126ee62 Revert "Produce _alwayslink sibling targets through bp2build" 
Revert submission 2467901-b/267214124

Reason for revert: compile error

Reverted changes: /q/submissionid:2467901-b/267214124

Change-Id: I2235fd1457fda60b4613d5512f7fb20b7044a2db
Fix: 271943047
 2023-03-07 04:16:53 +00:00
Wei Li
13d1319456 Export Soong module type to LOCAL_SOONG_MODULE_TYPE to Make for SBOM generation. am: 598f92d704 am: 261721421f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374715

Change-Id: I4674c96b4310bf8d5a2f18a467b8953938523f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 04:02:35 +00:00
Wei Li
261721421f Export Soong module type to LOCAL_SOONG_MODULE_TYPE to Make for SBOM generation. am: 598f92d704 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374715

Change-Id: I707631cba7423523563c327d73c4b27b9070533a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 03:25:06 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
7e8fb7d09f Merge "Produce _alwayslink sibling targets through bp2build" am: 0eee856e69 am: 644fa4761a am: 8964205079 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2467901

Change-Id: Ib20c0dde03d90e43ad6aeb332cae7970d7da6a87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:02:34 +00:00
Jiakai Zhang
da72c03f76 Merge "Revert "Generate a boot image extension for mainline BCP jars."" am: fe7755802e am: c2a7ec3783 am: aba25ecccb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2466300

Change-Id: I53574a5a0ea6a78fb1881a33cc89a0c215f38d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:01:59 +00:00
Kiyoung Kim
2dcb2a91ce Merge "Implement API surface import with APEX stub" am: 8972e4d6bb am: 4a511cd6c3 am: bc3f791601 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2421967

Change-Id: I6682100eb609272ddd47f39314ba02d593472bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:01:36 +00:00
Chris Wailes
9e0879f493 Merge "Enable LTO for Rust dylibs" am: b547b65ed3 am: ae3e4e85f0 am: 2908f9683a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2468260

Change-Id: I36e5d0a8fc15e89e5a2ae099bfcea11a48be11a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:00:41 +00:00
Alix Espino
15879fb1ba Merge "removing codegen_cli from Bp2buildKeepExistingBuildFile" am: f229654372 am: 301e587515 am: 4cb00c46aa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2467464

Change-Id: I25cff6b4dc97d17465886d8346acff42a828598e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:57:44 +00:00
Liz Kammer
b808a83319 Merge "Migrate overlapping config var defs in all bp file" am: edec71adae am: ebe523c177 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2472144

Change-Id: Iee893ba5a49753585c74bf73a25824f398e885b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 22:52:22 +00:00
Wei Li
598f92d704 Export Soong module type to LOCAL_SOONG_MODULE_TYPE to Make for SBOM generation. 
Bug: 266726655
Test: CI

Change-Id: If5b1a77930a591b6061ca2749c9c5ad29b4491fb
 2023-03-06 22:51:03 +00:00
Liz Kammer
ebe523c177 Merge "Migrate overlapping config var defs in all bp file" am: edec71adae 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2472144

Change-Id: I8006e3112b7b65977d7e2582352fa2bd06221bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 22:15:35 +00:00
Alix Espino
f0dcf6eec7 Merge changes from topic "ktResourceStrip" am: 09907dab55 am: 956e77d412 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470481

Change-Id: Icf0ff70d7856ee04cff5342c2629520b4a0e49b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 21:57:43 +00:00
Alix
6722869b6c resource_strip_prefix support for kotlin srcs am: 4d56abf937 am: 9ba68b0ba3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470480

Change-Id: Iec7cf154c3e48a5bd5a23528045fbaee97d66166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 21:57:39 +00:00
Liz Kammer
edec71adae Merge "Migrate overlapping config var defs in all bp file" 2023-03-06 21:39:52 +00:00
Alix Espino
956e77d412 Merge changes from topic "ktResourceStrip" am: 09907dab55 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470481

Change-Id: Ifacfb6a5d1aa499b2751f8304fd97a91ef8a4a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 21:05:12 +00:00
Alix
9ba68b0ba3 resource_strip_prefix support for kotlin srcs am: 4d56abf937 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470480

Change-Id: I1067269852d77b2ed53550840eeb7daa98a92560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 21:05:08 +00:00
Alix Espino
09907dab55 Merge changes from topic "ktResourceStrip" 
* changes:
  code cleanup for bp2build java_binary with kt srcs
  resource_strip_prefix support for kotlin srcs
 2023-03-06 20:32:16 +00:00
Treehugger Robot
4800985881 Merge "conv_linker_config proto works with empty input" am: 6bc5e2cefa am: f432b44ddd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470881

Change-Id: I3fdcd8237808619fad34c3a852556ac283655031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 19:48:04 +00:00
Treehugger Robot
f432b44ddd Merge "conv_linker_config proto works with empty input" am: 6bc5e2cefa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470881

Change-Id: Ia5e665d370d39dd8521900aef5e2140774d35dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 19:11:54 +00:00
Treehugger Robot
6bc5e2cefa Merge "conv_linker_config proto works with empty input" 2023-03-06 18:36:10 +00:00
Treehugger Robot
8ab4bf80f1 Merge "soong: Add Cortex-A32 definitions" am: 80ebd72995 am: 5963f06818 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470067

Change-Id: Ie0fbea15374c0ff51d47e39748dc2588ffb2e7b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 18:34:36 +00:00
Treehugger Robot
5963f06818 Merge "soong: Add Cortex-A32 definitions" am: 80ebd72995 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470067

Change-Id: Ibb2f773e79edbae3609a200f397f9ced31991aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 18:00:09 +00:00
Zi Wang
12c62fc748 Merge "Allowlist merged_txts dependencies and combined_apis type" am: 1841e5d023 am: 1bc028dbc0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2439360

Change-Id: I345d459dd794556647ae4a4dbde7f2da145825d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 17:41:38 +00:00
Treehugger Robot
80ebd72995 Merge "soong: Add Cortex-A32 definitions" 2023-03-06 17:26:20 +00:00
Zi Wang
1bc028dbc0 Merge "Allowlist merged_txts dependencies and combined_apis type" am: 1841e5d023 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2439360

Change-Id: Ia207e04c3a62e9675d4716af763d290caf9d9220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 17:06:52 +00:00
Zi Wang
1841e5d023 Merge "Allowlist merged_txts dependencies and combined_apis type" 2023-03-06 16:28:45 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
8964205079 Merge "Produce _alwayslink sibling targets through bp2build" am: 0eee856e69 am: 644fa4761a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2467901

Change-Id: Idbc1f403beacec26850d68aff1fc281ebb6eae90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:53:16 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
644fa4761a Merge "Produce _alwayslink sibling targets through bp2build" am: 0eee856e69 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2467901

Change-Id: Idece90f656691cd6ec8be120beda4dae09d7cefd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 15:15:03 +00:00
Alex Márquez Pérez Muñíz Díaz Puras Thaureaux
0eee856e69 Merge "Produce _alwayslink sibling targets through bp2build" 2023-03-06 14:43:28 +00:00
Liz Kammer
8103dc428e Migrate overlapping config var defs in all bp file 
Unlike most module types, config variable handling is always namespaced
to the Android.bp file, which limits reuse of the variable definitions.
Additionally multiple of these module types can define a string variable
in the same config namespace, but specify different valid values for the
string.

Previously, we cached the first instance we see of variable + namespace;
however, this caused non-determinism in which defintion would be used
and not migrating all values. Instead, we now only cache within a single
Android.bp file where the variable definitions are re-used.

Test: go tests
Bug: 271481817
Change-Id: Ic327657c508e47a705bacd24712a1916e105c7cd
 2023-03-06 09:15:36 -05:00
Jiakai Zhang
aba25ecccb Merge "Revert "Generate a boot image extension for mainline BCP jars."" am: fe7755802e am: c2a7ec3783 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2466300

Change-Id: I8f0376815dc6f36ab0a3d4ceb9c3f3c3b864049c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 10:59:27 +00:00
Jiakai Zhang
c2a7ec3783 Merge "Revert "Generate a boot image extension for mainline BCP jars."" am: fe7755802e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2466300

Change-Id: I3cab1be29735e495690b3d3fc96b7e6800e436e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 10:23:52 +00:00
Jiakai Zhang
fe7755802e Merge "Revert "Generate a boot image extension for mainline BCP jars."" 2023-03-06 09:53:03 +00:00
Kiyoung Kim
bc3f791601 Merge "Implement API surface import with APEX stub" am: 8972e4d6bb am: 4a511cd6c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2421967

Change-Id: Ic169062db72237a902ec041f1cd5c39e1db6d0cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 01:54:28 +00:00