Commit Graph

62494 Commits

Author SHA1 Message Date
Treehugger Robot
711b970c56 Merge "Remove SdkAware.SdkMemberComponentName" am: 3c867b6ce8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2318637

Change-Id: Ied96346e321fbbbfd741ad7fbf67ae6b542976af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 15:19:38 +00:00
Treehugger Robot
3c867b6ce8 Merge "Remove SdkAware.SdkMemberComponentName" 2023-01-07 14:36:24 +00:00
Hsin-Yi Chen
d784b6e192 Merge "Add header_abi_checker properties for vendor, product, and platform" am: 8a5d4126a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2370209

Change-Id: I70c38a8f9d68536d8bebf5a0c4c08c1eb7d64bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 07:59:42 +00:00
Hsin-Yi Chen
8a5d4126a2 Merge "Add header_abi_checker properties for vendor, product, and platform" 2023-01-07 07:35:49 +00:00
Wei Li
093c0a9bb7 Merge "Add integration test for testing the arch variant passed to cc modules included in APEXES." am: fcfc9d3130
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2350557

Change-Id: I92a66d67cfa1d474220d1712480725fe6de2419d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 07:04:01 +00:00
Wei Li
fcfc9d3130 Merge "Add integration test for testing the arch variant passed to cc modules included in APEXES." 2023-01-07 06:35:09 +00:00
Cole Faust
25ba48a5ca Merge "Bp2build support for multiple product configs" am: 501a7976be
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2316418

Change-Id: I0c25a7ee0f50bb4056fc4356a394f8e94ea746a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-07 03:41:31 +00:00
Cole Faust
501a7976be Merge "Bp2build support for multiple product configs" 2023-01-07 03:09:08 +00:00
Paul Duffin
377dae0a30 Merge "Remove IsModuleInVersionedSdk" am: e76fa00998
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2318636

Change-Id: I303545c8e011c667933eae6e05b1924e924a9a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 23:09:49 +00:00
Paul Duffin
066e0c7d31 Merge "Dedup checks for module being in versioned sdk snapshot" am: 5366821635
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2318635

Change-Id: I3f17a4a6e5ce3d1868c72e8ce5d9320d41fbb537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 23:09:36 +00:00
Paul Duffin
0f9602bda5 Merge "Stop using versioned snapshots in TestBasicSdkWithBootclasspathFragment" am: c8fe431e89
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2318634

Change-Id: Ic5cc4935c3c7cdbeac201c3c4cabd4d88a889487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 23:08:48 +00:00
Wei Li
6c588296a2 Add integration test for testing the arch variant passed to cc modules included in APEXES.
Bug: 258422889
Test: build/soong/tests/run_integration_tests.sh
Change-Id: I0852454e1d18ccd706f5270c0c87f9546cede5bf
2023-01-06 22:40:52 +00:00
Paul Duffin
e76fa00998 Merge "Remove IsModuleInVersionedSdk" 2023-01-06 22:37:59 +00:00
Paul Duffin
5366821635 Merge "Dedup checks for module being in versioned sdk snapshot" 2023-01-06 22:37:15 +00:00
Paul Duffin
c8fe431e89 Merge "Stop using versioned snapshots in TestBasicSdkWithBootclasspathFragment" 2023-01-06 22:35:58 +00:00
Bill Yi
cecdaca1e1 [automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: 4a0f4020ca -s ours
am skip reason: Merged-In I1c6f5fccdddcece10d5ebc54e6323dd801fa567e with SHA-1 ee245ec9a1 is already in history

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

Change-Id: I973faebb3deed37cb7c73263db2472bfad87349b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:00:38 +00:00
Bill Yi
9c263c0f5b [automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: f09cfc4d5f -s ours
am skip reason: Merged-In I1c6f5fccdddcece10d5ebc54e6323dd801fa567e with SHA-1 ee245ec9a1 is already in history

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

Change-Id: I28db32b41f36ed66e8e3ce2c3eb6f0f21ba42c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 20:00:04 +00:00
Treehugger Robot
7068e04813 Merge "support libs for android_library" am: 6228be4cd4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374710

Change-Id: I8c6f16deba92ada16eea3f0b4c765848e76d0f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 19:54:50 +00:00
Bill Yi
4a0f4020ca Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" 2023-01-06 19:33:50 +00:00
Treehugger Robot
6228be4cd4 Merge "support libs for android_library" 2023-01-06 19:30:02 +00:00
Bill Yi
f09cfc4d5f Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE
Merged-In: I1c6f5fccdddcece10d5ebc54e6323dd801fa567e
Merged-In: I64f8f25224bf2b6bdeb28bd2672c662a5a197dc1
Change-Id: I2c335a301c7c90f68ff6c62035f47fba30cb6a8b
2023-01-06 07:13:50 -08:00
Bill Yi
ff484a494f Merge "Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2023-01-06 07:00:53 +00:00
Cole Faust
ee245ec9a1 Merge "Show correct line numbers for errors in an $(eval)" am: c49c49a69d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374719

Change-Id: I1c6f5fccdddcece10d5ebc54e6323dd801fa567e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 03:42:11 +00:00
Cole Faust
c49c49a69d Merge "Show correct line numbers for errors in an $(eval)" 2023-01-06 03:13:29 +00:00
Sam Delmerico
a7282fb5b9 bp2build converts android.hardware.audio AIDL am: a2cccc3926
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2376316

Change-Id: I505579c1b71fa6d90c4b9c99a018a97af3fe0a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 02:19:59 +00:00
Sam Delmerico
a2cccc3926 bp2build converts android.hardware.audio AIDL
Test: build --config=android //hardware/interfaces/audio/aidl:android.hardware.audio.effect-V1-ndk_aidl_code_gen
Change-Id: I55764604fbed4e40dd85b1e2fd1491fa043c92f8
2023-01-05 16:55:28 -05:00
Alix
82fb94e91e support libs for android_library
adds support for *-> android_library and android_library->* edges

Change-Id: I41d4e1d1b8106a17e67951d47e67b59ef3170d17
Test: manually inspected build files for libWallpaperPicker & android-suppor-v4
2023-01-05 21:13:57 +00:00
Cole Faust
b85d1a15cc Bp2build support for multiple product configs
Create a
build/bazel/product_config/generated/products/<product_name>/BUILD
file that contains the platform definitions needed for
a particular product. Currently we just create it for the
current lunch target, but the idea is that eventually when
all product config is in starlark, all the products will
have their platform definitions in the tree at once.

Bug: 249685973
Test: Presubmits
Change-Id: I08c82ff28dcf62f09d3b1d2e3186a6b961e12f6e
2023-01-05 12:49:14 -08:00
Joe Onorato
36f7be8ae9 Merge "Move common functions to script_utils.sh" am: 059285911d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2328177

Change-Id: I5c1871e5bdba3543c681c998d691624f1d78b85c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 20:33:21 +00:00
Joe Onorato
059285911d Merge "Move common functions to script_utils.sh" 2023-01-05 20:10:10 +00:00
Cole Faust
7366042870 Show correct line numbers for errors in an $(eval)
Bug: 264488559
Test: go test
Change-Id: I95ce0345912a2af351be0ecc4595bdc4a2047c0c
2023-01-05 11:22:46 -08:00
Paul Duffin
27139a1412 Merge "Stop changes to BAZEL_METRICS_DIR regenerating ninja file" am: 58f7784e95
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2366149

Change-Id: I1c2b7503fbf4193ddadfa264973f68d75636d15b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 18:57:02 +00:00
Paul Duffin
58f7784e95 Merge "Stop changes to BAZEL_METRICS_DIR regenerating ninja file" 2023-01-05 18:02:10 +00:00
Mark Dacek
7a065260c1 Merge "Rename proto field." am: 92297f21a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2376348

Change-Id: I5a7f24f2935c234ebdd1719a9775257fc17a3660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 16:39:33 +00:00
Mark Dacek
92297f21a3 Merge "Rename proto field." 2023-01-05 16:15:07 +00:00
Treehugger Robot
04c07ed541 Merge "Run ckati step of the Android build tracing given variables" am: c00d91df96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2359425

Change-Id: I522611cf9c06057c35a09e3936d75439990f9838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 05:55:33 +00:00
Treehugger Robot
c00d91df96 Merge "Run ckati step of the Android build tracing given variables" 2023-01-05 05:21:56 +00:00
Spandan Das
cb9e93a480 Merge "Revert "R8/D8 should use sdk_version prop to determine API surface stability."" am: 85333078aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2376156

Change-Id: I580ec49153b5bb9801008da73cf3d2a6b61305dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 02:55:07 +00:00
Spandan Das
85333078aa Merge "Revert "R8/D8 should use sdk_version prop to determine API surface stability."" 2023-01-05 02:24:16 +00:00
Spandan Das
7eb9243fa7 Revert "R8/D8 should use sdk_version prop to determine API surface stability."
This reverts commit daa220ae8c.

Reason for revert: Suspected to be a cause for build failure (b/264446640). Will use go/abtd to verify

Change-Id: Ibfdf893f2426b1119923467027e0acedd08808c1
2023-01-04 22:14:59 +00:00
Alix Espino
1ce6face3e Merge "Libs support for * -> java_library_edge with kt sources" am: d363771bc1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2357747

Change-Id: I3a1c69576b91b8efc91097b09e5387231bc34eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 22:14:37 +00:00
Cole Faust
ff9a165037 Merge "Fix missing test name after aosp/2372150" am: 49dd3d583e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2374712

Change-Id: Ia19bac4301709447971bc2f13bc8f1734cf8b6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 22:14:11 +00:00
Alix Espino
d363771bc1 Merge "Libs support for * -> java_library_edge with kt sources" 2023-01-04 22:11:55 +00:00
MarkDacek
a3a62a37b4 Rename proto field.
Test: N/A
Change-Id: I97dd3bc26afcbef4ad69cb7a3cbad73bf34b5fe6
2023-01-04 22:04:44 +00:00
Cole Faust
49dd3d583e Merge "Fix missing test name after aosp/2372150" 2023-01-04 21:50:30 +00:00
Bill Yi
851f004092 Merge TQ1A.230105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: I73b550375da0be9b35634a6b47f3117ac9d894f9
Change-Id: I2f4337668d77ceeff3196169e002cead254a3147
2023-01-04 12:52:28 -08:00
Cole Faust
ce8d7f6d71 Merge "Use WriteFileRule instead of custom echo commands" am: da5e739628
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2362261

Change-Id: Icd6bbba8d409936f558b623d9899f8e9a0fdc796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 20:07:28 +00:00
Cole Faust
da5e739628 Merge "Use WriteFileRule instead of custom echo commands" 2023-01-04 19:40:26 +00:00
Cole Faust
0cec5ea146 Fix missing test name after aosp/2372150
The test name defaulting to ctx.ModuleName() was
accidentally removed, readd it

Bug: 184895128
Fixes: 264423240
Fixes: 264433459
Test: Verified ninja files produced with this cl and aosp/2372150 are the same as with aosp/2372150 reverted
Change-Id: I23ab8ab39132b93719cc6f797d92b1cabce5eae9
2023-01-04 11:24:28 -08:00
Sasha Smundak
648e32c341 Run ckati step of the Android build tracing given variables
Test: `m nothing && build/soong/scripts/run-ckati.sh FOO BAR`, see FOO
and BAR assignments in out/ckati.trace

Change-Id: Ife8bb6d716bfde5ee9f75b85b1e5738ab2238dce
2023-01-04 10:08:43 -08:00