Commit Graph

82715 Commits

Author SHA1 Message Date
Cole Faust
21d8e4068e Merge "Make the enabled property configurable" into aosp-main-future am: 1256e6f47a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27162921

Change-Id: Ia3e905622c7e9fcf95fbb8c76a8144cbf2324529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 19:46:24 +00:00
Cole Faust
1256e6f47a Merge "Make the enabled property configurable" into aosp-main-future 2024-05-01 19:33:59 +00:00
Treehugger Robot
5df6f17a13 Merge "soong: Use the CpExecutable rule for copying libraries" into main am: 08f670ab4a am: 72a12da662
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706813

Change-Id: I3aa26f39385fcfab0be8fb243fe7dbcea8b56aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 18:29:30 +00:00
Treehugger Robot
ca8298793e Merge "Add RELEASE_APEX_CONTRIBUTIONS_MODULE_METADATA build flag" into main am: 83ede7c225 am: d8e8238c3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066190

Change-Id: If402110c189dac85f945ed08000e3c60c26e2a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 18:29:18 +00:00
Ivan Lozano
0616dae413 Merge "rust: Add a default cfg indicating an AOSP build" into main am: ec6dc938c9 am: e38da90477
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066423

Change-Id: I1df40b544d903b4e7b7a1a4b891644b70d28582a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 18:29:01 +00:00
Treehugger Robot
72a12da662 Merge "soong: Use the CpExecutable rule for copying libraries" into main am: 08f670ab4a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2706813

Change-Id: Iab9dfdb6dd57f03f40a83a8b9431e7117c48639a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 18:22:10 +00:00
Treehugger Robot
08f670ab4a Merge "soong: Use the CpExecutable rule for copying libraries" into main 2024-05-01 18:20:41 +00:00
Treehugger Robot
d8e8238c3a Merge "Add RELEASE_APEX_CONTRIBUTIONS_MODULE_METADATA build flag" into main am: 83ede7c225
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066190

Change-Id: Idaebb3cd47fea5cf95d2a9ccdd6c40673cd4d754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 18:16:54 +00:00
Ivan Lozano
e38da90477 Merge "rust: Add a default cfg indicating an AOSP build" into main am: ec6dc938c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066423

Change-Id: I5b6351cfc8c7f84d2e84c133c8fb560a6238e365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 18:16:45 +00:00
Treehugger Robot
995baca1cd Merge "rust: Don't suppress adding deps for rust-project.json device override" into main am: 9a988c4f5b am: 760c68cb0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3068786

Change-Id: I927c501ddd654ef141f48737f23901dc23dff807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 18:10:30 +00:00
Florian Mayer
22a2aa19bf Merge "Pass -mllvm flags for memtag-stack correctly to linker" into main am: 39b536260a am: 9ae855cccd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069242

Change-Id: I12b57055e33562597469279091b5c02f9ddfeaac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 18:10:16 +00:00
Treehugger Robot
83ede7c225 Merge "Add RELEASE_APEX_CONTRIBUTIONS_MODULE_METADATA build flag" into main 2024-05-01 18:06:00 +00:00
Ivan Lozano
ec6dc938c9 Merge "rust: Add a default cfg indicating an AOSP build" into main 2024-05-01 17:53:47 +00:00
Treehugger Robot
760c68cb0a Merge "rust: Don't suppress adding deps for rust-project.json device override" into main am: 9a988c4f5b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3068786

Change-Id: I20c28cc3e9df88729208f79c6efcbe5367d0e34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 17:47:01 +00:00
Florian Mayer
9ae855cccd Merge "Pass -mllvm flags for memtag-stack correctly to linker" into main am: 39b536260a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069242

Change-Id: I402747b021d5dea7994a4ead634834b8ef7eb2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 17:46:47 +00:00
Treehugger Robot
9a988c4f5b Merge "rust: Don't suppress adding deps for rust-project.json device override" into main 2024-05-01 17:35:44 +00:00
Treehugger Robot
b77319cf34 Merge "remove hwasan-use-after-scope=1 which is default now" into main am: cba8307c25 am: 38e8695b9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3067687

Change-Id: I24113d2670db76fa92a7b0f1f93aa22f4fdc856e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 17:35:39 +00:00
Florian Mayer
39b536260a Merge "Pass -mllvm flags for memtag-stack correctly to linker" into main 2024-05-01 17:29:31 +00:00
Treehugger Robot
38e8695b9e Merge "remove hwasan-use-after-scope=1 which is default now" into main am: cba8307c25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3067687

Change-Id: I63fb38bc74c36da8fdd71cd969cf5482d6051c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 17:10:42 +00:00
Treehugger Robot
cba8307c25 Merge "remove hwasan-use-after-scope=1 which is default now" into main 2024-05-01 16:55:05 +00:00
Treehugger Robot
be43654c4e Merge "Add new storage deps in forced read-only mode" into main am: 82e91a602b am: e6dae288ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3068633

Change-Id: I48a7f64b42bd8be4cd55617703dd264e9dc6afb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 15:51:17 +00:00
Treehugger Robot
e6dae288ae Merge "Add new storage deps in forced read-only mode" into main am: 82e91a602b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3068633

Change-Id: I35864d7a1f67a9f2f78cf33beaf05431ad16daae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 15:36:26 +00:00
Treehugger Robot
82e91a602b Merge "Add new storage deps in forced read-only mode" into main 2024-05-01 15:12:51 +00:00
Ivan Lozano
07fd7e32fd rust: Add a default cfg indicating an AOSP build
This adds a cfg flag `android_platform` which can be used
to indicate there's some conditional compilation need specific to
AOSP.

Test: New flag is emitted on builds
Change-Id: I833a7d68db2dad7ab2d32a5eb51d764f0d66b849
2024-05-01 10:41:35 -04:00
Ted Bauer
c3031c5c7b Add new storage deps in forced read-only mode
Bug: 328444881
Test: m
Change-Id: I26d5d5c96414a62f2f83eb4d725e69cea61214da
2024-05-01 13:54:40 +00:00
Adam Wright
6e97b79a68 Merge changes from topic "revert-3066748-duplicate_entry_fs-CIBDJQYRHU" into main am: 0141b4acad am: 1ea4100cb5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069323

Change-Id: I283bdae9fac1fd0e90fdcc01281973e2157cf623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 10:40:06 +00:00
Adam Wright
1ea4100cb5 Merge changes from topic "revert-3066748-duplicate_entry_fs-CIBDJQYRHU" into main am: 0141b4acad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069323

Change-Id: I83e6051471cdde453d3ce944cf99fcc7739d4018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 10:21:30 +00:00
Adam Wright
0141b4acad Merge changes from topic "revert-3066748-duplicate_entry_fs-CIBDJQYRHU" into main
* changes:
  Revert "Prevent multiple PackagingSpecs having same installation..."
  Revert "Filesystem modules follow the installation semantic"
2024-05-01 09:59:21 +00:00
Jiyong Park
3d65d9cb90 Revert "Prevent multiple PackagingSpecs having same installation..."
Revert submission 3066748-duplicate_entry_fs

Reason for revert: b/338159248

Reverted changes: /q/submissionid:3066748-duplicate_entry_fs

Change-Id: I89906e160f62f1bf84eb65a1b99940f139626786
2024-05-01 05:25:41 +00:00
Jiyong Park
54351867fa Revert "Filesystem modules follow the installation semantic"
Revert submission 3066748-duplicate_entry_fs

Reason for revert: b/338159248

Reverted changes: /q/submissionid:3066748-duplicate_entry_fs

Change-Id: I8aacdb36efce8343c3713542eee209e71bde660b
2024-05-01 05:25:42 +00:00
Treehugger Robot
5638db5ab3 Merge changes from topic "duplicate_entry_fs" into main am: 543d4f3b7d am: 86b5f8dcc8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066748

Change-Id: I4f9792a4c4e9445818867f33042989662ed5b5d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 03:35:32 +00:00
Jiyong Park
ed64efdcd6 Prevent multiple PackagingSpecs having same installation path am: a51c4ce10e am: 1e414a1f08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066922

Change-Id: Ic2470b6e1597d22c401057f70c853e37fb5dbf1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 03:35:29 +00:00
Treehugger Robot
86b5f8dcc8 Merge changes from topic "duplicate_entry_fs" into main am: 543d4f3b7d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066748

Change-Id: I65e536f7de2611e058054b85c83e01a0b2cf2855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 03:15:35 +00:00
Jiyong Park
1e414a1f08 Prevent multiple PackagingSpecs having same installation path am: a51c4ce10e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066922

Change-Id: I8312cc64b24d8a446f53627917d492410ff32847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 03:15:32 +00:00
Treehugger Robot
543d4f3b7d Merge changes from topic "duplicate_entry_fs" into main
* changes:
  Filesystem modules follow the installation semantic
  Prevent multiple PackagingSpecs having same installation path
2024-05-01 02:43:23 +00:00
Florian Mayer
99addb1802 remove hwasan-use-after-scope=1 which is default now
This is part of Android LLVM toolchain:

https://cs.android.com/android/platform/superproject/main/+/main:prebuilts/clang/host/linux-x86/clang-r510928/BUILD_INFO;l=79

477610d4d0/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp (135)

Change-Id: I2812fac89584a8324126d15525b6ee78f5494a50
2024-05-01 00:56:22 +00:00
Treehugger Robot
030d68e63e Merge changes I4c38860c,I2bdc8876 into main am: 6ab1b1fd03 am: 304ce05171
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066028

Change-Id: I0d22898e16bbd70fa514088b8cb6b0f6fd44091a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 00:56:06 +00:00
Treehugger Robot
304ce05171 Merge changes I4c38860c,I2bdc8876 into main am: 6ab1b1fd03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066028

Change-Id: Ic3304be18ac791bcff1c99491b7a75f0922b38a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 00:37:53 +00:00
Florian Mayer
ab97e28bf6 Pass -mllvm flags for memtag-stack correctly to linker
Bug: 309446520
Change-Id: I08519db0323a754c66acaa0ace5c41d962809ac6
2024-05-01 00:36:06 +00:00
Treehugger Robot
6ab1b1fd03 Merge changes I4c38860c,I2bdc8876 into main
* changes:
  release_config: various cleanup
  Support release configs with only aconfig flags
2024-05-01 00:14:44 +00:00
Matthew Maurer
c1e0cb695b rust: Don't suppress adding deps for rust-project.json device override
When switching from an initially found host module to a later found
device module, we passed `cInfo.Deps` through. This actually suppresses
addition of some modules, which was not the intention.

Bug: 336695421
Test: SOONG_GEN_RUST_PROJECT=1 m blueprint_tests
Test: check rust-projects.json manually afterwards for deps
Change-Id: Ib90f9c755e07f88e85a3b3cbd9bc698cce8af038
2024-04-30 23:26:29 +00:00
LaMont Jones
ff387eaacb release_config: various cleanup
- Allow scl and textproto data to coexist for now
- Print warnings to stderr instead of stdout.
- Improve formatting of output
- Set displays the new value for all configs, and what file changed.
- Use prettier error messages for better UX
- put build-flag on the path.

Bug: 328495189
Test: manual
Change-Id: I4c38860c2fb24db5111e0cecf790660a4ff2b8b2
2024-04-30 16:12:50 -07:00
LaMont Jones
dc86819307 Support release configs with only aconfig flags
Release configs with `aconfig_flags_only: true` can inherit build flag
values, but cannot set them.

Bug: 328495189
Test: manual
Change-Id: I2bdc88761d61fb20f10dc734f2ba87114f51b859
2024-04-30 15:38:11 -07:00
Treehugger Robot
d00fc5f0df Merge "Move coverage builds prebuilt special case to make" into main am: 2f5d35347b am: 2a74527c3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066022

Change-Id: I9a7d1d77d269ebf9c0f51e4927cb3b9a98a73814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 20:46:08 +00:00
Treehugger Robot
f301c440b3 Merge "Remove incorrect strict test for test-suites for test_module_config" into main am: d58ac5358d am: d8e5e9288f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066624

Change-Id: I00d00b7b0848990a0011c57a883a4a7330029e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 20:45:52 +00:00
Treehugger Robot
2a74527c3a Merge "Move coverage builds prebuilt special case to make" into main am: 2f5d35347b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066022

Change-Id: I1e9f4a46042d683c76be24320debbfeb2a06c845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 20:27:19 +00:00
Treehugger Robot
d8e5e9288f Merge "Remove incorrect strict test for test-suites for test_module_config" into main am: d58ac5358d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066624

Change-Id: I54aea2e7d6b23d4111b729d9b8d9a763f989f9a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 20:26:42 +00:00
Treehugger Robot
2f5d35347b Merge "Move coverage builds prebuilt special case to make" into main 2024-04-30 20:04:44 +00:00
Treehugger Robot
d58ac5358d Merge "Remove incorrect strict test for test-suites for test_module_config" into main 2024-04-30 19:57:23 +00:00
Jiyong Park
742f54c4bc Filesystem modules follow the installation semantic
With this change, filesystem modules (android_filesystem,
android_system_image, etc.) follow the installation semantic which means
output from modules which don't produce installable files (i.e. modules
that return false on IsSkipInstall()) are not included in the filesystem
module.

Note that this bug has been there since the beginning but didn't trigger
an error due to another bug (b/335506668) which allowed multiple
packaging specs to contribute to the same path. That bug prevented the
non-installable variant of a module (e.g. stub) from being installed
simply because because it was "luckly" clobbered by the installable
variant of the same module (e.g. impl lib).

Bug: 335506668
Test: go test ./...
Change-Id: I2a42d178701d74bf6ccc5f33ba33918f8c608d40
2024-04-30 19:02:57 +00:00