Commit Graph

81920 Commits

Author SHA1 Message Date
Treehugger Robot
c42283844d Merge "Export JavaBootLibsSdkMemberType and JavaSystemserverLibsSdkMemberType" into main am: b291690bc4 am: f2a9631f03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005678

Change-Id: I6e1fa0e258bdcd76518f6c6c8f9e2836f2182bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 03:26:01 +00:00
Treehugger Robot
f2a9631f03 Merge "Export JavaBootLibsSdkMemberType and JavaSystemserverLibsSdkMemberType" into main am: b291690bc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005678

Change-Id: I7a9756ea75108b5d243a15ebcfca92208e26c737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-21 03:08:20 +00:00
Treehugger Robot
b291690bc4 Merge "Export JavaBootLibsSdkMemberType and JavaSystemserverLibsSdkMemberType" into main 2024-03-21 02:47:59 +00:00
Cole Faust
2c3fd767bb Merge "Add more specific partition visibility rules" into main am: e6ea0399a9 am: 5d71dc57a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3006962

Change-Id: I404a731b9330be86b93a287e888b002c666ce1ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 22:20:31 +00:00
Cole Faust
5d71dc57a1 Merge "Add more specific partition visibility rules" into main am: e6ea0399a9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3006962

Change-Id: I0584f5365cb9080b20de4a772aa37037ddd90ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 22:02:26 +00:00
Cole Faust
e6ea0399a9 Merge "Add more specific partition visibility rules" into main 2024-03-20 21:50:26 +00:00
Spandan Das
159b264873 Export JavaBootLibsSdkMemberType and JavaSystemserverLibsSdkMemberType
build/soong/sdk will use these tags to differentiate the sdk and non-sdk
contents of bootclasspath and systemserverclasspath fragments.

Test: go build ./java
Bug: 326246905

Change-Id: Ia8352c09fcbbca06988eb57153e5986801eb45a5
2024-03-20 21:41:49 +00:00
Treehugger Robot
d17dd926b8 Merge "[cc:riscv64] Do not pass -mno-strict-align while linking" into main am: f586a2582d am: d72e4d7a91
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3007063

Change-Id: Ie17d281a22e9eb1b65196080232b0b9b96e281e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 21:02:13 +00:00
Treehugger Robot
d72e4d7a91 Merge "[cc:riscv64] Do not pass -mno-strict-align while linking" into main am: f586a2582d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3007063

Change-Id: I9e71f2ba3439be250153f4863ceaadcabeef0c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 20:46:49 +00:00
Treehugger Robot
f586a2582d Merge "[cc:riscv64] Do not pass -mno-strict-align while linking" into main 2024-03-20 20:29:20 +00:00
Yu Liu
69fc3a6547 [automerger skipped] Merge "Pass "--container" to aconfig create-cache" into main am: 8426848ade am: c86c27397c -s ours
am skip reason: Merged-In I096877015b78786639376b279a9be5d07594d92e with SHA-1 b75ed0f2d8 is already in history

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

Change-Id: Ica62880643dcc0abbdf3185301d43585fd7f67da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 19:02:02 +00:00
Yu Liu
c86c27397c Merge "Pass "--container" to aconfig create-cache" into main am: 8426848ade
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3007272

Change-Id: I76c4feb6d5f49d3bdcb90212fe10c85aaf5ad70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 18:47:19 +00:00
Yu Liu
8426848ade Merge "Pass "--container" to aconfig create-cache" into main 2024-03-20 18:29:45 +00:00
Elliott Hughes
ca28491172 Merge "Defer to clang for --hash-style." into main am: bc7c97b15b am: 6f2985f0d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3007713

Change-Id: I6f6d69e8f75dbfacc0dbfb51e6a003f8551eb9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 18:07:01 +00:00
Cole Faust
9a24d90936 Add more specific partition visibility rules
//visibility:any_system_partition, //visibility:any_vendor_partition,
etc.

Then, if a partition visibility rule is not specificed, but the module
is installed on a non-system partition via the `vendor: true` or other
properties, the visibility rule for that partition will be added by
default.

This is so that "any_partition" doesn't imply that modules could be put
on the vendor partition when they weren't designed for that, and so that
modules that do need to go on the vendor partition don't need to specify
both vendor: true and visibility:any_vendor_partition.

Eventually, the partition properties should be deprecated, and replaced
with just these visibility rules.

Bug: 321000103
Test: go tests
Change-Id: I24dba36bbc20921941f892480bf7c050e93827c6
2024-03-20 10:55:05 -07:00
Elliott Hughes
6f2985f0d6 Merge "Defer to clang for --hash-style." into main am: bc7c97b15b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3007713

Change-Id: Ia3a7e5ee18f502536ce3f38cf324c60cd0f1d695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 17:33:57 +00:00
Pirama Arumuga Nainar
950e8c97fe [cc:riscv64] Do not pass -mno-strict-align while linking
Bug: http://b/327307773

Newer clang rejects this flag as unsupported.  It is not necessary while linking because the flag is passed as an IR feature.

Change-Id: I781afd913be7c07612196e736c3ae58773791071
2024-03-20 17:25:20 +00:00
Elliott Hughes
bc7c97b15b Merge "Defer to clang for --hash-style." into main 2024-03-20 16:47:40 +00:00
Elliott Hughes
b48fb83936 Defer to clang for --hash-style.
We fixed the clang driver to "do the right thing" based on target api level years ago, but these manual workarounds predate that (or were copy & pasted from places that predated that). We don't need them any more.

See https://github.com/android/ndk/issues/2005 for more detail.

Change-Id: I995741b8606e389e8de8272f1cc532624516245a
2024-03-20 14:50:26 +00:00
Treehugger Robot
d2644fc357 Merge "Add aliases property for renaming Rust dependencies." into main am: 1845175d61 am: 6ed2a88f06
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3006527

Change-Id: I2a2533bdf7e9e2981d50ff86315d5ebdbfea4463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 12:59:28 +00:00
Treehugger Robot
6ed2a88f06 Merge "Add aliases property for renaming Rust dependencies." into main am: 1845175d61
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3006527

Change-Id: I239056195d0e30d0970c0645848f379aba87982e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 12:40:51 +00:00
Treehugger Robot
1845175d61 Merge "Add aliases property for renaming Rust dependencies." into main 2024-03-20 12:27:53 +00:00
Treehugger Robot
8fd5eb844f Merge "Modify dist artifact dependency to respect the RELEASE_HIDDEN_API_EXPORTABLE_STUBS build flag" into main am: bd339315ca am: 4ce43d4d7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3008113

Change-Id: I286bf2f627f456c9e3b8a503790f5667f15078f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 12:21:31 +00:00
Treehugger Robot
4ce43d4d7a Merge "Modify dist artifact dependency to respect the RELEASE_HIDDEN_API_EXPORTABLE_STUBS build flag" into main am: bd339315ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3008113

Change-Id: Id60469e1d6ddd796986cba340bdc3d9b7c4be24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 12:05:51 +00:00
Treehugger Robot
bd339315ca Merge "Modify dist artifact dependency to respect the RELEASE_HIDDEN_API_EXPORTABLE_STUBS build flag" into main 2024-03-20 11:33:11 +00:00
Jihoon Kang
0216805aae Modify dist artifact dependency to respect the RELEASE_HIDDEN_API_EXPORTABLE_STUBS build flag
Currently, the "exportable" stubs and the api files are copied to the
dist directory during SDK builds regardless of the value of the
RELEASE_HIDDEN_API_EXPORTABLE_STUBS build flag. This change modifies
such behavior that the "exportable" artifacts are copied to the dist
directory only when the RELEASE_HIDDEN_API_EXPORTABLE_STUBS flag value
is set to true.

Test: lunch aosp_arm-trunk_staging-eng && m sdk dist and inspect ninja graph to verify that the "everything" artifacts are copied to the dist directory
Bug: 330417789
Change-Id: I3b83375610eb172d7b9da7ea831a74cd427b696c
2024-03-20 07:45:29 +00:00
Treehugger Robot
c40eb42d23 Merge "Support multilib property for cc_genrule" into main am: 1f4ffda2ed am: fd7635c0bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3002539

Change-Id: I72d69fdfe5c8c0c7f5d8302d5abc7df477b35443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 03:14:12 +00:00
Treehugger Robot
fd7635c0bb Merge "Support multilib property for cc_genrule" into main am: 1f4ffda2ed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3002539

Change-Id: I6c7ea53cc99ffa001a02036ab9cd27dca7dc0b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 02:55:50 +00:00
Treehugger Robot
1f4ffda2ed Merge "Support multilib property for cc_genrule" into main 2024-03-20 02:38:30 +00:00
Treehugger Robot
0075d3996a Merge "Add aconfig flag support for android_library" into main am: 5c0a491e0a am: d2d9eb3808
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3007351

Change-Id: I49acafe4b994d6afc0b12cff7a4f732e86f8ae04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 01:50:52 +00:00
Treehugger Robot
8793f4b2e6 Merge "Change java stem attribute for both device and host" into main am: 064b145365 am: a0b4138118
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000681

Change-Id: I74518d8df6b299836801d7c04129ca62e2504e8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 01:50:40 +00:00
Treehugger Robot
d2d9eb3808 Merge "Add aconfig flag support for android_library" into main am: 5c0a491e0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3007351

Change-Id: I79dd922859b6747506450160def4c120d3067cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 01:27:11 +00:00
Treehugger Robot
a0b4138118 Merge "Change java stem attribute for both device and host" into main am: 064b145365
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000681

Change-Id: I1430679819786ed90a4cd5d9502499fc65c1eacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 01:26:59 +00:00
kellyhung
750334a0c0 Support multilib property for cc_genrule
Change genrule Out to `android:"arch_variant"` for supporting
multilib variants.

Bug: 323295272
Test: go test -run TestMultilibGenruleOut

Change-Id: I102d64b45a5a2a5193f813001fc32da0d1fe9d36
2024-03-20 09:25:41 +08:00
Treehugger Robot
5c0a491e0a Merge "Add aconfig flag support for android_library" into main 2024-03-20 01:23:50 +00:00
Treehugger Robot
064b145365 Merge "Change java stem attribute for both device and host" into main 2024-03-20 01:05:50 +00:00
Treehugger Robot
37d02c4408 Merge "Move ELF build-id reader into a separate library." into main am: ac45b4bc63 am: 79814e1396
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3003637

Change-Id: Ib87a5c1ea36312eca30278068cdb725ba1eb096f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 01:00:39 +00:00
Jihoon Kang
dc2dbaab5f Merge "Propagate intermediateCacheFiles in java modules and filegroup" into main am: 6e739b9b4d am: c46855cedb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001320

Change-Id: Ied1675ac82cc37ad2ba058483d51fae3f9facd96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 00:59:46 +00:00
Treehugger Robot
79814e1396 Merge "Move ELF build-id reader into a separate library." into main am: ac45b4bc63
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3003637

Change-Id: I8bccb04734a8e06009a0840eeaaef24de499a625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 00:27:16 +00:00
Jihoon Kang
c46855cedb Merge "Propagate intermediateCacheFiles in java modules and filegroup" into main am: 6e739b9b4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001320

Change-Id: Ibf8348f0f55deb6cada88b6e9baa6fe8b509eac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-20 00:26:44 +00:00
Treehugger Robot
ac45b4bc63 Merge "Move ELF build-id reader into a separate library." into main 2024-03-20 00:13:10 +00:00
Jihoon Kang
6e739b9b4d Merge "Propagate intermediateCacheFiles in java modules and filegroup" into main 2024-03-20 00:08:50 +00:00
Jihoon Kang
9049c2725a Add aconfig flag support for android_library
This change adds the support that was added to android_app in
https://r.android.com/2854663 for android_library modules.

Implementation details:
- Move `Flags_packages` to aaptProperties, so that it can be utilized
  for both android_app and android_library.
- Wrap `VisitDirectDeps` of aconfig_declarations to a function that
  takes a ModuleContext as an input, so that it can be utilized in the
  `GenerateAndroidBuildActions` of both android_app and android_library.

Test: m nothing --no-skip-soong-tests
Bug: 330222981
Change-Id: I8a755f5ca615c8a1651afcd2ec441fc9fbd82c61
2024-03-20 00:06:05 +00:00
Spandan Das
364e22e431 Merge "Use RELEASE_DISABLE_VERIFY_OVERLAPS_CHECK to disable verify_overlaps" into main am: a8ad9bbd4f am: 74719a3405
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3006963

Change-Id: Ib3dde46b37ae43db5cb7cc480f05f45e62c5a8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 23:55:52 +00:00
Spandan Das
74719a3405 Merge "Use RELEASE_DISABLE_VERIFY_OVERLAPS_CHECK to disable verify_overlaps" into main am: a8ad9bbd4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3006963

Change-Id: Ia07a37c9a46419c62e0641166e6a308744524523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 23:41:01 +00:00
Spandan Das
a8ad9bbd4f Merge "Use RELEASE_DISABLE_VERIFY_OVERLAPS_CHECK to disable verify_overlaps" into main 2024-03-19 23:23:53 +00:00
Yu Liu
eeff222655 Pass "--container" to aconfig create-cache
Bug: 328823994
Test: unit tests and manual tests locally.

Ignore-AOSP-First: It is easier to detect all the mismatch in internal
master.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b75ed0f2d8c4d13924573fd065c9706475aac17b)
Merged-In: I096877015b78786639376b279a9be5d07594d92e
Change-Id: I096877015b78786639376b279a9be5d07594d92e
2024-03-19 23:07:34 +00:00
Spandan Das
07145109ff Use RELEASE_DISABLE_VERIFY_OVERLAPS_CHECK to disable verify_overlaps
This build flag will be used to disable the check when prebuilts are
used in internal main. For backwards compatibilty,
RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE can also be used to disable
this check.

Test: m nothing
Bug: 328200369
Change-Id: I710811995723e75bea9de1ce5c77504f66cbcf45
2024-03-19 21:32:19 +00:00
Jihoon Kang
705e63e362 Propagate intermediateCacheFiles in java modules and filegroup
This change propagates the intermediateCacheFiles generated by the
aconfig_declarations to the static rdeps that are java modules or the
rdeps that are filegroups.

Test: m nothing
Bug: 329284345
Change-Id: I02431336c1aa0378d03248f3bb6edf2f57ec3b7f
2024-03-19 20:54:05 +00:00
Treehugger Robot
a080e29259 Merge changes I7a102fa1,Ic3156e53 into main am: 97409cd9a2 am: 70e7573851
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3002035

Change-Id: I616ed5c85b9f1aa9b6bc4a66117b0c8ac0d3dd08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 18:00:46 +00:00