Commit Graph

81732 Commits

Author SHA1 Message Date
Treehugger Robot
48a71014cd Merge "Setting the version to 350090000 while we figure out what version numbers to use" into main 2024-02-21 19:55:48 +00:00
Cole Faust
1da0b20575 Allow soong config value variables to set nested properties
Previously, it would error out if it saw anything that wasn't a string
or slice of strings. Now it will also recurse in sub-structs.

Fixes: 326255534
Test: go test
Change-Id: Icbca8e4a2cf54b5610599a10805550fed05eb396
2024-02-21 11:38:09 -08:00
Aditya Kumar
4e27d68f6f Merge "Remove wtautological warnings added during toolchain update" into main am: 6edbaa369f am: 88ce10f609
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2952984

Change-Id: I6c4688bbfd8da0b06ae28a05faaf89db8987c785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 19:05:30 +00:00
Yu Liu
f133acae71 Merge "Support aconfig stoage files for apex." into main am: 864fd2f1f5 am: cd72a6387a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2966056

Change-Id: I86d77269802f6e3f4ef548bc53352edd99acb7f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 19:05:18 +00:00
Aditya Kumar
88ce10f609 Merge "Remove wtautological warnings added during toolchain update" into main am: 6edbaa369f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2952984

Change-Id: Ibec9ac92e9fbf3b7ab4ddeef285ac6c153508959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 18:49:37 +00:00
Yu Liu
cd72a6387a Merge "Support aconfig stoage files for apex." into main am: 864fd2f1f5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2966056

Change-Id: Ia4fa4729d2d4967c56c72dff3a9007927782cf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 18:48:39 +00:00
Colin Cross
304fe339c6 [automerger skipped] Merge META-INF/services/* files in merge_zips -jar am: 1e1f0188c1 -s ours
am skip reason: Merged-In I69f80d1265c64c671d308ef4cdccfa1564abe056 with SHA-1 47efcdcf6b is already in history

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

Change-Id: Ia4aa3a1d1e77f13e564c66df214ec179b3aea300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 18:47:06 +00:00
Colin Cross
aa8fc1815c [automerger skipped] Strip META-INF/services from implementation jars when using as header jars am: 9bc4228f88 -s ours
am skip reason: Merged-In I40d48644bc5a09a9564dc2c4b38f627edd00fcf8 with SHA-1 d3b1b77184 is already in history

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

Change-Id: I3317bd19393b6fd53f7262d931c53d6f252736af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 18:47:00 +00:00
Aditya Kumar
6edbaa369f Merge "Remove wtautological warnings added during toolchain update" into main 2024-02-21 18:43:28 +00:00
Alexei Nicoara
9a0bdffa85 Setting the version to 350090000 while we figure out what version numbers to use
Bug: 323452698
Change-Id: I3e716485e719ca986ffe9dfcb93da1669de0c758
Test: presubmit
2024-02-21 17:49:22 +00:00
Yu Liu
864fd2f1f5 Merge "Support aconfig stoage files for apex." into main 2024-02-21 17:42:58 +00:00
Andrew Walbran
440a281939 Merge "Revert^4 "Integrate Rust-specific System Properties into rules generation."" into main am: c0a6d29e49 am: a556c303b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2965053

Change-Id: I66b6a08065a81e6409cc0527cef0f449dce25865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 13:01:03 +00:00
Andrew Walbran
a556c303b9 Merge "Revert^4 "Integrate Rust-specific System Properties into rules generation."" into main am: c0a6d29e49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2965053

Change-Id: I195bfa8667027039d1259016d8150f07d7548a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 12:21:31 +00:00
Andrew Walbran
c0a6d29e49 Merge "Revert^4 "Integrate Rust-specific System Properties into rules generation."" into main 2024-02-21 11:53:45 +00:00
Andrew Walbran
a5deb7307d Revert^4 "Integrate Rust-specific System Properties into rules generation."
This reverts commit 2766baa922.

Reason for revert: Relanding after fix in I3b190ebc1a1096972d0a1273e490972e04684dd2

Change-Id: Ie34301c506d3469ec3306f433631b0842b66d032
2024-02-21 11:53:18 +00:00
Jihoon Kang
cc24fce7f1 Merge "Modify sdk_library to dist exportable api files by default" into main am: 5135a0df57 am: c09ef10f8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2970651

Change-Id: I8f4f37a00d0be29616201c212f1e62b721a06bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 08:28:39 +00:00
Jihoon Kang
c09ef10f8d Merge "Modify sdk_library to dist exportable api files by default" into main am: 5135a0df57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2970651

Change-Id: I75c03735713efc3d920cacc04bae33229138ac0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 08:09:38 +00:00
Aditya Kumar
2f65cc24bb Merge "Error on the usage of -target flag" into main am: 30aec0dfb1 am: 40efd8d644
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2944973

Change-Id: Ie835d0d97c875babe46f68c806c0bb1d4f3ae8a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 08:07:44 +00:00
Jihoon Kang
5135a0df57 Merge "Modify sdk_library to dist exportable api files by default" into main 2024-02-21 07:30:30 +00:00
Aditya Kumar
40efd8d644 Merge "Error on the usage of -target flag" into main am: 30aec0dfb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2944973

Change-Id: Idc2d76f8029765415a45d1dfcf8e6f818de216c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 07:06:16 +00:00
Aditya Kumar
30aec0dfb1 Merge "Error on the usage of -target flag" into main 2024-02-21 06:30:45 +00:00
Treehugger Robot
5eccc8747a Merge "Ignore modules which are not exported to Make." into main am: d741b7f9f2 am: 9258c46749
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2970151

Change-Id: I3c00510529e3ceb80e0c1ba2c35e20f7f10dbf45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 06:22:35 +00:00
Treehugger Robot
9258c46749 Merge "Ignore modules which are not exported to Make." into main am: d741b7f9f2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2970151

Change-Id: I00b7aa59b8d620b4a1226a1aa1455af01cf945b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 05:42:21 +00:00
Treehugger Robot
d741b7f9f2 Merge "Ignore modules which are not exported to Make." into main 2024-02-21 04:54:36 +00:00
Treehugger Robot
d73e69f031 Merge "AOSP platform_apis violations" into main am: dcda79b5e7 am: 7fd2b6f964
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969671

Change-Id: I7c40ea056e1651cb9d8c1e05521989585f744ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 23:23:09 +00:00
Chris Wailes
959adda26f Merge "Revert "Re-land "Make building Rust targets faster in eng builds""" into main am: f49f7d58ca am: 7aebd20972
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969318

Change-Id: Ib426b37268a225b430d2ba7af752d5c65e144d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 23:22:41 +00:00
Jihoon Kang
d1799f6835 Modify sdk_library to dist exportable api files by default
Currently, the "exportable" stubs are copied to the dist directory by
default when building the java_sdk_library module. However, "everything"
api files (current & removed) are copied to the dist directory, causing
confusion to the developers. This change modifies the default behavior
so that the "exportable" api files are copied to the dist directory and
match the behavior of the stubs.

Test: m nothing
Bug: 325639165
Change-Id: I2e3b158bb638d30629120b32aa3e88bb26231020
2024-02-20 23:06:11 +00:00
Treehugger Robot
7fd2b6f964 Merge "AOSP platform_apis violations" into main am: dcda79b5e7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969671

Change-Id: I8e411a5390f9af312a4dd2f54abb04f41e5b5884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 23:04:31 +00:00
Stephen Hines
41f2ab846a rustc-1.75.0 Build 11471753
Bug: https://issuetracker.google.com/issues/321303117
Test: m rust
Change-Id: I90f0efb4eb3b6fcc41fbe256a9079e0e5647663c
2024-02-20 14:59:31 -08:00
Kiyoung Kim
6730216165 Merge "Do not allow to link libbinder from Vendor APEX" into main 2024-02-20 22:59:18 +00:00
Treehugger Robot
dcda79b5e7 Merge "AOSP platform_apis violations" into main 2024-02-20 22:46:31 +00:00
Chris Wailes
7aebd20972 Merge "Revert "Re-land "Make building Rust targets faster in eng builds""" into main am: f49f7d58ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969318

Change-Id: I4e8a4df8571fe81d3cd465aefec27d236ff3d1f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 22:42:13 +00:00
Chris Wailes
f49f7d58ca Merge "Revert "Re-land "Make building Rust targets faster in eng builds""" into main 2024-02-20 22:10:14 +00:00
Chris Wailes
99180c23d2 Revert "Re-land "Make building Rust targets faster in eng builds""
This reverts commit e3da5ea86b.

Reason for revert: b/326108486

Change-Id: Ia99c6024f41f863d7a2a2eaea0567c330c2b1a89
2024-02-20 21:39:40 +00:00
Mårten Kongstad
c08769d9ee Merge "Include all_aconfig_declarations in sdk dist" into main am: cbc967ffc2 am: cbddac094d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969051

Change-Id: I58df9cdacae2fff573b88a6ead91a64a2344e155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 21:36:55 +00:00
Mårten Kongstad
cbddac094d Merge "Include all_aconfig_declarations in sdk dist" into main am: cbc967ffc2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2969051

Change-Id: I86cb51df447ca48bc301818e6a11c88eed5c1426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 20:55:46 +00:00
Chris Wailes
9d690ee182 Merge "Re-land "Make building Rust targets faster in eng builds"" into main am: 431f004e59 am: 7a32a9f24e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2966051

Change-Id: I0231b53b90ff31345192a13234784953c50751d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 20:32:42 +00:00
Mårten Kongstad
cbc967ffc2 Merge "Include all_aconfig_declarations in sdk dist" into main 2024-02-20 20:27:37 +00:00
Chris Wailes
7a32a9f24e Merge "Re-land "Make building Rust targets faster in eng builds"" into main am: 431f004e59
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2966051

Change-Id: I425f84db07be71debe3e4e61efcff99d845596f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 19:51:02 +00:00
Chris Wailes
431f004e59 Merge "Re-land "Make building Rust targets faster in eng builds"" into main 2024-02-20 19:02:02 +00:00
Andrew Walbran
fb7566456c Ignore modules which are not exported to Make.
Bug: 323833345
Test: forrest run on git_udc-qpr-dev-plus-aosp/aosp_arm64-trunk_staging-userdebug
Change-Id: I3b190ebc1a1096972d0a1273e490972e04684dd2
2024-02-20 18:13:58 +00:00
Spandan Das
8469e939f3 AOSP platform_apis violations
This allowlist contains java_library modules which set the no-op
property `platform_apis`. This allowlist will help enforce that there
are no new violations.

This should be a no-op till
https://android-review.git.corp.google.com/c/platform/build/soong/+/2969451
is submitted

Test: presubmits
Bug: 215379393
Change-Id: I49372e1d476201f607cd717be26aa3909668ff26
2024-02-20 17:22:22 +00:00
Mårten Kongstad
2a1adcc63a Include all_aconfig_declarations in sdk dist
Include all_aconfig_declarations in the sdk dist directory, in both
binary protobuf (for machine consumption) and text protobuf (for human
consumption) format.

Bug: 324281288
Test: m sdk dist && test -e out/dist/flags.pb && test -e out/dist/flags.textproto
Change-Id: Icfb4841c3fe6478ddc233ef6d092ca700a8acb20
2024-02-20 12:51:25 +01:00
Spandan Das
542093ed4a Merge "Disable dexpreopt if optional_uses_libs does not have an impl" into main am: 4bec95e2f6 am: 8a1033139c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2963583

Change-Id: Idd3198fc02b39ea6a8efa5f70437d3be4ad6e99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 09:22:36 +00:00
Spandan Das
3043620447 Merge "Revert "Revert "Create a product variable for skipping apex cont..."" into main am: 73f4a4a481 am: 5a1b90d2fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967067

Change-Id: I8deaced03330bef03a5c63b647ec7d5387b09060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 09:22:20 +00:00
Spandan Das
8a1033139c Merge "Disable dexpreopt if optional_uses_libs does not have an impl" into main am: 4bec95e2f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2963583

Change-Id: I49ab495bfeb2e2d4c9a6c170ed73c47e0efe9802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 08:42:37 +00:00
Spandan Das
5a1b90d2fa Merge "Revert "Revert "Create a product variable for skipping apex cont..."" into main am: 73f4a4a481
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2967067

Change-Id: Ib71d70a6b61ae25c5a8f6bfc4788ae517452ca32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 08:42:23 +00:00
Spandan Das
4bec95e2f6 Merge "Disable dexpreopt if optional_uses_libs does not have an impl" into main 2024-02-20 08:08:35 +00:00
Spandan Das
73f4a4a481 Merge "Revert "Revert "Create a product variable for skipping apex cont..."" into main 2024-02-20 07:53:03 +00:00
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