Commit Graph

81896 Commits

Author SHA1 Message Date
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
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
Cole Faust
7441750d88 Merge "Handles if a space is encountered while parsing the rule" into main am: 3e8bd45638 am: ac2181a54e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2975671

Change-Id: Ia2fd07a44dd47537e30aa1069022b45b13d7f78f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 17:58:27 +00:00
Yu Liu
6c8e0b6bba Merge "Pass "--container" to aconfig create-cache" into main 2024-03-19 17:51:22 +00:00
Treehugger Robot
70e7573851 Merge changes I7a102fa1,Ic3156e53 into main am: 97409cd9a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3002035

Change-Id: Iaa337363bc4fce5f86e6dea74d9ec226f7058ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 17:44:37 +00:00
Cole Faust
ac2181a54e Merge "Handles if a space is encountered while parsing the rule" into main am: 3e8bd45638
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2975671

Change-Id: Ifc9741be2b54da07aebdb11ff71e8c7df749124e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 17:42:52 +00:00
Treehugger Robot
97409cd9a2 Merge changes I7a102fa1,Ic3156e53 into main
* changes:
  [cc:riscv64] change -munaligned-access to -mno-strict-align
  Fully document all the riscv64 flags.
2024-03-19 17:42:45 +00:00
Cole Faust
3e8bd45638 Merge "Handles if a space is encountered while parsing the rule" into main 2024-03-19 17:21:02 +00:00
Pirama Arumuga Nainar
0593537f58 [cc:riscv64] change -munaligned-access to -mno-strict-align
Bug: http://b/327307773

cd071253c7 removed -munaligned-access

Change-Id: I7a102fa1cdc49564cb0b724e6f177d33b3636f55
Test: presubmit
2024-03-19 16:28:31 +00:00
yangbill
2af0b6edd7 Change java stem attribute for both device and host
Bug: 329762127
Test: cd build/soong/java ; go test -run TestJavaLibHostWithStem
Test: cd build/soong/java ; go test -run TestAppStem
Test: cd build/soong/java ; go test -run TestAndroidAppImport_ArchVariants
Test: cd build/soong/java ; go test -run TestOverrideAndroidAppStem
Test: cd build/soong/java ; go test -run TestOverrideAndroidApp
Test: cd build/soong/java ; go test -run TestPackageNameOverride

Change-Id: I8fbdc82116f9a0c68121fbbeb1ef4f78f2b6fea3
2024-03-19 09:11:59 +00:00
Treehugger Robot
2a1e98dc60 Merge "Revert^9 "Enable dex container (DEX v41) for the whole system"" into main am: 84fedd36a4 am: 16ebf41398
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005894

Change-Id: Ic30a3902facd682af2d91bfe70650c526098d6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 01:51:48 +00:00
Treehugger Robot
16ebf41398 Merge "Revert^9 "Enable dex container (DEX v41) for the whole system"" into main am: 84fedd36a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005894

Change-Id: Ic8c78a634bbfd8a9f9e44c0afe3fe5a743de7723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 01:34:58 +00:00
Treehugger Robot
84fedd36a4 Merge "Revert^9 "Enable dex container (DEX v41) for the whole system"" into main 2024-03-19 01:20:15 +00:00
Treehugger Robot
9a0be32d7f Merge "Generate wrapper lib.rs with one module per sysprop file." into main am: e430878f48 am: c229db6be3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000957

Change-Id: I716516bbf15306b2457af16687a8feb05beacb90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 23:12:03 +00:00
Treehugger Robot
c229db6be3 Merge "Generate wrapper lib.rs with one module per sysprop file." into main am: e430878f48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000957

Change-Id: I15c98dfb1e54e573e361c7a1aee6f63446ea58b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 22:57:19 +00:00
Treehugger Robot
e430878f48 Merge "Generate wrapper lib.rs with one module per sysprop file." into main 2024-03-18 22:41:05 +00:00
Yu Liu
4bf8a3d227 Merge "Support rust in aconfig mode validation." into main am: 73cf0e87b4 am: e4128bdd13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001754

Change-Id: I4c42da933a6c64be282fafb7e1226c0098e028db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 21:21:46 +00:00
Yu Liu
e4128bdd13 Merge "Support rust in aconfig mode validation." into main am: 73cf0e87b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001754

Change-Id: I3bc128985c3957c525420e4ffa846140f7a31582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 21:04:30 +00:00
Yu Liu
73cf0e87b4 Merge "Support rust in aconfig mode validation." into main 2024-03-18 20:49:35 +00:00
Elliott Hughes
c2600464c7 Fully document all the riscv64 flags.
In particular, make it clearer when/how we can remove each of them.

Change-Id: Ic3156e53ea56479324781fea737390588bc086b5
2024-03-18 19:37:13 +00:00
Andrew Walbran
acd75d2b50 Generate wrapper lib.rs with one module per sysprop file.
This required moving to a SourceProvider for the Rust library. With the
previous approach only the first input file was being used.

Bug: 270547306
Test: Built libplatformproperties_rust, looked at output
Change-Id: I1070655abc071e099a42bc4be61cc080902e31c1
2024-03-18 19:02:04 +00:00
Yuncheol Heo
113654faca Revert^9 "Enable dex container (DEX v41) for the whole system"
This reverts commit b92a4e1ca9.

Reason for revert: tracking the test failure b/329907267

Change-Id: Id3fa8471f073e0ec705fd0aba653b032ff82f9ad
2024-03-18 17:41:12 +00:00
Yu Liu
b75ed0f2d8 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.

Change-Id: I096877015b78786639376b279a9be5d07594d92e
2024-03-18 17:01:49 +00:00
Spandan Das
a249574eed Merge "Support mechanism to select a specific version of module sdk prebuilt" into main am: c36d579c2b am: 91c8756bd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005213

Change-Id: If71c7c2184bd902adb32651110ce295c675bb328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 16:45:15 +00:00
Spandan Das
91c8756bd2 Merge "Support mechanism to select a specific version of module sdk prebuilt" into main am: c36d579c2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005213

Change-Id: I57d60aca6bb6ada6c5ecbc6c0262d60c4ccd8601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 16:25:59 +00:00