Commit Graph

81471 Commits

Author SHA1 Message Date
Kiyoung Kim
28c97bc5a5 Do not allow to link libbinder from Vendor APEX
Libbinder was temporarily allowed to be linked from Vendor APEXes before
all other modules are ready to use libbinder_ndk instead. This should be
removed before VNDK deprecation.

Bug: 301378087
Test: Husky build and boot succeeded
Ignore-AOSP-First: Build fix required from plus aosp branch
Change-Id: Id32868489a1a5dd0337aa6bdb773d93bc4e5a921
2024-02-20 00:37:53 +00:00
Treehugger Robot
a4ccd0358c Merge "Version LLNDK ABI dumps with VendorApiLevel" into main am: 3ce80aef7f am: 2e7afd66e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2952267

Change-Id: I22e0a86af6f9839a3356fcbf222dd6a263b74657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 07:20:26 +00:00
Treehugger Robot
2e7afd66e0 Merge "Version LLNDK ABI dumps with VendorApiLevel" into main am: 3ce80aef7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2952267

Change-Id: I2376a555fce6de5cbdaff51c3fc54e9bb9df18c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 06:39:59 +00:00
Treehugger Robot
3ce80aef7f Merge "Version LLNDK ABI dumps with VendorApiLevel" into main 2024-02-17 05:58:03 +00:00
Treehugger Robot
b74d370a23 [automerger skipped] Merge "Revert "Create a product variable for skipping apex contribution..."" into main am: 3e48d693f4 am: 620753f9fa -s ours
am skip reason: Merged-In Ib2c018a2aeda5578cf3f1a6a56253bf84850ba5f with SHA-1 88b1d9b01a is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/build/soong/+/2964564

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

Change-Id: I17d369c1880425365aa4c6ef8103cd331f784cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 02:47:45 +00:00
Hsin-Yi Chen
c4f635e254 Merge "Separate LLNDK ABI diff reports from the other variants" into main am: 53eb289ad0 am: 9f66c04e8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2950226

Change-Id: I8334196abd261fc63c3e57a91fac614346180e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 02:47:13 +00:00
Zi Wang
60f5873911 Merge "Add jarjar_prefix propagation support for aconfig_declarations_group module type" into main am: 0fd4bb8c70 am: 2559a85af4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967332

Change-Id: I90376ba499d5845607c58baaa09d232d83c81f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 02:46:47 +00:00
Treehugger Robot
620753f9fa Merge "Revert "Create a product variable for skipping apex contribution..."" into main am: 3e48d693f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2966054

Change-Id: Id5ec5d2e9fea52488e78b1afea62d902a11f98f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 02:29:38 +00:00
Hsin-Yi Chen
9f66c04e8d Merge "Separate LLNDK ABI diff reports from the other variants" into main am: 53eb289ad0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2950226

Change-Id: Ia8f90f4e5fc818a77c66b52478698c03f95cd60e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 02:28:08 +00:00
Treehugger Robot
3e48d693f4 Merge "Revert "Create a product variable for skipping apex contribution..."" into main 2024-02-17 02:24:02 +00:00
Hsin-Yi Chen
53eb289ad0 Merge "Separate LLNDK ABI diff reports from the other variants" into main 2024-02-17 02:15:39 +00:00
Zi Wang
2559a85af4 Merge "Add jarjar_prefix propagation support for aconfig_declarations_group module type" into main am: 0fd4bb8c70
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967332

Change-Id: I0aedb1a1c34054269666a6f25624c68e079a73f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 02:07:27 +00:00
Zi Wang
0fd4bb8c70 Merge "Add jarjar_prefix propagation support for aconfig_declarations_group module type" into main 2024-02-17 01:24:09 +00:00
Treehugger Robot
c3b27cb24c Merge "Revert "Create a product variable for skipping apex contribution..."" into main 2024-02-17 00:53:13 +00:00
Jihoon Kang
3801a965d5 Revert "Create a product variable for skipping apex contribution..."
Revert submission 2964509-skip-apex-contributions

Reason for revert: 325666427

Reverted changes: /q/submissionid:2964509-skip-apex-contributions

Change-Id: I510e81c8e06803dc014c9f04c3e357065aa19ce5
2024-02-16 23:25:06 +00:00
Jihoon Kang
39f416d248 Revert "Create a product variable for skipping apex contribution..."
Revert submission 26233489-skip-ac-parent

Reason for revert: 325666427

Reverted changes: /q/submissionid:26233489-skip-ac-parent

Change-Id: Ib695302abea5da2db9671d689538aa1e6caf931f
2024-02-16 23:22:11 +00:00
Jihoon Kang
03d014ff2b Add jarjar_prefix propagation support for aconfig_declarations_group module type
jarjar_prefix propagation logic currently depends on the type of the
providers of the dependencies, thus the logic needs to be updated when a
new provider is added. Since `aconfig_declarations_group` module type
utilizes its custom provider "CodegenInfoProvider", this change adds
jarjar_prefix propagation support for this provider.

Test: Set aconfig_declaration module's exportable property to true && m framework-minus-apex and inspect if "repackaged-jarjar" subdir exists in outdir
Bug: 310504781
Change-Id: I1689027d7810687a53ec34b9cfda479806f2ec87
2024-02-16 22:22:18 +00:00
Joonhun Shin
0545b37c6b Merge "Revert "Make building Rust targets faster in eng builds"" into main am: af9fc549ca am: a9600a3d48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967044

Change-Id: I52149ad127cbc6f4102fa2a3921bf14dcb0ee6c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-16 09:21:48 +00:00
Joonhun Shin
a9600a3d48 Merge "Revert "Make building Rust targets faster in eng builds"" into main am: af9fc549ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967044

Change-Id: I62ccaeaaf670bc808f5a71a3eb196c29f4080b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-16 08:41:59 +00:00
Joonhun Shin
af9fc549ca Merge "Revert "Make building Rust targets faster in eng builds"" into main 2024-02-16 07:56:01 +00:00
Joonhun Shin
fad3e69d7f Revert "Make building Rust targets faster in eng builds"
This reverts commit 6146cf4b98.

Reason for revert: <b/325547632>

Change-Id: Ifd3619c5db5b989edb4aa2c37f85e5cd88d0c633
2024-02-16 07:26:14 +00:00
Inseob Kim
646fa99f59 Merge "Fix characteristic rro for overridden packages" into main am: f617e18741 am: aab9ab67ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2963742

Change-Id: I57f2014d7d86689ef1257a642eb5e0f6b9bfb2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-16 03:04:02 +00:00
Inseob Kim
aab9ab67ad Merge "Fix characteristic rro for overridden packages" into main am: f617e18741
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2963742

Change-Id: Iada941f7badf0686bf0352fe8a74ea030cfd21cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-16 02:23:48 +00:00
Inseob Kim
f617e18741 Merge "Fix characteristic rro for overridden packages" into main 2024-02-16 01:41:48 +00:00
Chris Wailes
eb8b4c1b6e Merge "Make building Rust targets faster in eng builds" into main am: 3fae67a32d am: ca0f0040c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609425

Change-Id: I9f41b5eb91ec6f74eaa1c9b41530eb5f0b435646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-16 00:37:54 +00:00
Chris Wailes
ca0f0040c9 Merge "Make building Rust targets faster in eng builds" into main am: 3fae67a32d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2609425

Change-Id: Ia4cce313d0748dff406a18a1f3795a27f165852a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-15 23:58:10 +00:00
Chris Wailes
3fae67a32d Merge "Make building Rust targets faster in eng builds" into main 2024-02-15 23:12:27 +00:00
Paul Duffin
61c62a1af7 Merge "Revert^3 "Integrate Rust-specific System Properties into rules generation."" into main am: a0f0bdbced am: 6d92eac7ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2965047

Change-Id: I88301c9bd719c88854c531947d49e948794e949b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-15 14:12:37 +00:00
Paul Duffin
6d92eac7ab Merge "Revert^3 "Integrate Rust-specific System Properties into rules generation."" into main am: a0f0bdbced
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2965047

Change-Id: Ie44d7d3404efdc321e0a135e96c8696aef39f55c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-15 13:31:52 +00:00
Paul Duffin
a0f0bdbced Merge "Revert^3 "Integrate Rust-specific System Properties into rules generation."" into main 2024-02-15 12:45:47 +00:00
Andrew Walbran
4a540ba885 Merge "Revert^2 "Integrate Rust-specific System Properties into rules generation."" into main am: e38e2c0071 am: 046cae3d91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962845

Change-Id: I5fb846a7e612e9e9d5fbc576ca61cc074d4e9ecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-15 12:06:33 +00:00
Paul Duffin
2766baa922 Revert^3 "Integrate Rust-specific System Properties into rules generation."
This reverts commit ac0c87311d.

Reason for revert: breaking the same bug, b/323833345 as before

Change-Id: I474c032148f22c4b98f7adf23be61807fa0500a0
2024-02-15 11:54:17 +00:00
Andrew Walbran
046cae3d91 Merge "Revert^2 "Integrate Rust-specific System Properties into rules generation."" into main am: e38e2c0071
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962845

Change-Id: I21920e674e54c2f0221943a7370c205ea0212317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-15 11:26:06 +00:00
Andrew Walbran
e38e2c0071 Merge "Revert^2 "Integrate Rust-specific System Properties into rules generation."" into main 2024-02-15 10:31:49 +00:00
Spandan Das
bdb0d19eb0 [automerger skipped] Merge "Create a product variable for skipping apex contribution contents" into main am: 90db03c007 am: beb624f3b0 -s ours
am skip reason: Merged-In Ib2c018a2aeda5578cf3f1a6a56253bf84850ba5f with SHA-1 88b1d9b01a is already in history

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

Change-Id: I348e64e3cdc68d84b9d60256f4b4435f3c154377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-15 10:00:39 +00:00
Spandan Das
beb624f3b0 Merge "Create a product variable for skipping apex contribution contents" into main am: 90db03c007
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2964564

Change-Id: Ide346f77130120b326b8e5342f719d3039e1dc5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-15 08:57:24 +00:00
Spandan Das
90db03c007 Merge "Create a product variable for skipping apex contribution contents" into main 2024-02-15 08:10:57 +00:00
Spandan Das
68a6e29ed5 Create a product variable for skipping apex contribution contents
This denylist will be used to ignore the prebuilt google apexes listed
in apex_contributions of vendor/google/build when building aosp products
in next.

Test: go build ./android
Bug: 308187268
Change-Id: Ib2c018a2aeda5578cf3f1a6a56253bf84850ba5f
Merged-In: Ib2c018a2aeda5578cf3f1a6a56253bf84850ba5f
2024-02-15 01:39:26 +00:00
Spandan Das
6d1a68a531 Merge "Create a product variable for skipping apex contribution contents" into main 2024-02-15 01:33:59 +00:00
Treehugger Robot
a924175dd7 Merge changes I42eb64d3,I93d73757 into main am: e4c98ae235 am: ade9e28515
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962842

Change-Id: Iebdca1639072e5e44f6667f11cf172481108c4e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14 23:39:06 +00:00
Treehugger Robot
ade9e28515 Merge changes I42eb64d3,I93d73757 into main am: e4c98ae235
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962842

Change-Id: Ifdb4658032d8c4ef35a6bdf207843cf69de03973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14 22:59:14 +00:00
LaMont Jones
3c334ce2d1 [automerger skipped] Merge changes from topic "is_stubs_module" into main am: b45200bd0b am: 3b885b43ec -s ours
am skip reason: Merged-In I3219d0bf7e84a386b16b248314f11b4e9edcd0fa with SHA-1 e38cf6ecff is already in history

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

Change-Id: I2e956f7aa56557740b2ebdacb8e28f127b4fc4eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14 22:17:24 +00:00
Jihoon Kang
05a88f91ae [automerger skipped] Introduce library property is_stubs_module am: fe914ed17f am: d60be87b3c -s ours
am skip reason: Merged-In Ic81488dbd1c9af1b5d31a33e5e9441d9f1416dbe with SHA-1 1cd52610d1 is already in history

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

Change-Id: If107e41442a3232eee2e0ce31bb6ff9408eed5d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14 22:17:20 +00:00
Treehugger Robot
e4c98ae235 Merge changes I42eb64d3,I93d73757 into main
* changes:
  Enable droidstubs to depend on aconfig_declarations_group module type
  Introduce module type aconfig_declarations_group
2024-02-14 22:14:30 +00:00
LaMont Jones
3b885b43ec Merge changes from topic "is_stubs_module" into main am: b45200bd0b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962046

Change-Id: I0f169223082b697ec370cee91d1e3ed041bbe584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14 21:59:36 +00:00
Jihoon Kang
d60be87b3c Introduce library property is_stubs_module am: fe914ed17f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2959347

Change-Id: I4bad4dfcdefa6bf118ffee2bafc206cb8d3bf23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14 21:59:29 +00:00
Ronald Braunstein
9ad3f10603 Merge "Export teams even when module disabled." into main am: e48bcc2aaa am: 3655e86fd1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962048

Change-Id: Ie3c4ae2ea718fa5d8bc38ff193e0d1df6298897e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14 21:55:20 +00:00
LaMont Jones
b45200bd0b Merge changes from topic "is_stubs_module" into main
* changes:
  Improve determination whether to propagate JarJarProvider
  Introduce library property is_stubs_module
2024-02-14 21:38:20 +00:00
Ronald Braunstein
3655e86fd1 Merge "Export teams even when module disabled." into main am: e48bcc2aaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962048

Change-Id: I93afdf935c6bff38318c720f456efb187806e7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14 21:37:27 +00:00
Colin Cross
cb1ccf0cae Merge "Always use aapt2 --no-static-lib-packages" into main am: 308d64ed72 am: 8113101892
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2962085

Change-Id: I2ec8ca4bc09d2b27d23eafef005301ab35f03a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-14 21:34:12 +00:00