Commit Graph

81818 Commits

Author SHA1 Message Date
Cole Faust
3f48328d49 Merge "Keep replace_instead_of_append in arch prop structs" into main am: 703248196c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3059302

Change-Id: I9d2a9af1e5a8607b07529b9445dd5b21a0041b05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-24 22:11:41 +00:00
Kevin Liu
4814ca7068 Merge "Added Strict_mode logic catch direct usage of Robolectric reference" into main am: 0c07d46585
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3047028

Change-Id: I13cd680588d5ae42818cb08af50ba4659f76ddd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-24 22:10:03 +00:00
Cole Faust
703248196c Merge "Keep replace_instead_of_append in arch prop structs" into main 2024-04-24 21:36:17 +00:00
Kevin Liu
0c07d46585 Merge "Added Strict_mode logic catch direct usage of Robolectric reference" into main 2024-04-24 20:58:27 +00:00
Spandan Das
624b515946 Remove cc_api_library related code from sdkMutator am: 79cd6899c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3057485

Change-Id: I434989cafe04db1d6c4e28a05880d4f7f9253616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-24 19:03:24 +00:00
Spandan Das
546408526f Add .swp files to .gitignore am: 6d2656ef10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3057484

Change-Id: Ic4e9066339f53f2ab9f79badd5db2fc0b8bc2d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-24 19:03:21 +00:00
Cole Faust
5fda87b822 Keep replace_instead_of_append in arch prop structs
replace_instead_of_append is read by proptools.ExtendProperties() /
proptools.ExtendMatchingProperties(). These functions are called on
arch property structs, so we need to preserve it when creating the
arch property structs.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: Ic08704d8a2b710f5a5d99b62d3f8a37730bb6013
2024-04-24 11:21:14 -07:00
Kevin Liu
cab89b51c3 Added Strict_mode logic catch direct usage of Robolectric reference
When Strict_Mode is true, exclude Robolectric_all-target_upstream from the build pass, instead use the newly added robolectric_all-target_runtime, which compiles the robolectric lib into jar and later being added to final test jar.

Test: atest MyRoboTests
Bug: 334089788
Change-Id: I59291e3cc478e73f65950886853732ff0c5c5db7
2024-04-24 16:54:30 +00:00
Spandan Das
79cd6899c7 Remove cc_api_library related code from sdkMutator
This module type was used for multi-tree, which has since been
deprioritized.

Test: go test ./cc
Change-Id: If661aa1215022301cfa10cbe2cec4565faf89c14
2024-04-23 23:52:15 +00:00
Spandan Das
6d2656ef10 Add .swp files to .gitignore
Test: N/A
Change-Id: I410c5b732b0284562fa0e6312befcecf73c838d3
2024-04-23 23:51:45 +00:00
Ted Bauer
e7b8b02428 Merge "Add aconfig storage API deps to codegened lib" into main am: b39c877ae0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3055467

Change-Id: I55731c1bb3061080107e54b0e6e3bcc69ea3f4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 23:17:03 +00:00
Weijia He
4feb4f8a32 Merge "Generate test lists for Ravenwood and Robolectric tests" into main am: 3835928537
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3049132

Change-Id: If8ccad1761ee6f44315a4dacab52bed6ed6431ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 23:16:47 +00:00
Ted Bauer
b39c877ae0 Merge "Add aconfig storage API deps to codegened lib" into main 2024-04-23 22:56:50 +00:00
Weijia He
3835928537 Merge "Generate test lists for Ravenwood and Robolectric tests" into main 2024-04-23 22:54:37 +00:00
Ellen Arteca
42c2033b7e Merge "Adds support to bindgen to handle static inline fcts" into main am: 5e94e60cb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3053803

Change-Id: I995e6f0a524ed696c2df9b077867927ffb3d4410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 20:47:52 +00:00
Ellen Arteca
5e94e60cb7 Merge "Adds support to bindgen to handle static inline fcts" into main 2024-04-23 20:29:00 +00:00
Treehugger Robot
eddb53980b Merge "Ignore the .vscode/ folder" into main am: 88b3e0c33b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3055345

Change-Id: Ibcea424c7069a6697566f6436b74788e0e63c415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 19:54:58 +00:00
Treehugger Robot
88b3e0c33b Merge "Ignore the .vscode/ folder" into main 2024-04-23 19:40:46 +00:00
Ted Bauer
f0f18591a5 Add aconfig storage API deps to codegened lib
Change-Id: I4991c9fccb0a0bab15457883cf20aacb3142c4cf
2024-04-23 18:25:26 +00:00
Cole Faust
243e704ed0 Ignore the .vscode/ folder
Test: Presubmits
Change-Id: I3c500c8fca69c43529ef498870b659abd5654767
2024-04-23 09:56:01 -07:00
Paul Duffin
05903d700e Merge "Use new --api-lint-previous-api" into main am: a4362b937a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3051802

Change-Id: I4aa3871f2b7ed062702acb63a361dac77240e016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 13:29:07 +00:00
Paul Duffin
a4362b937a Merge "Use new --api-lint-previous-api" into main 2024-04-23 13:04:16 +00:00
Rico Wind
7de3822c96 Merge "Enable non final ids for non BusyBox builds" into main am: 8a2427cad2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3047121

Change-Id: Iea4a804c0aa9ca49ce46de04c4e9f968fab3cece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 04:19:32 +00:00
Rico Wind
8a2427cad2 Merge "Enable non final ids for non BusyBox builds" into main 2024-04-23 04:03:24 +00:00
Treehugger Robot
e3a893e190 Merge "Add more comments about soong config variables" into main am: 4eecd990d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3048329

Change-Id: I41859e4ccf06fcbfec89856763f360943390b9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 01:44:41 +00:00
Treehugger Robot
75195eea85 Merge "Add support to Soong config list variable" into main am: d47220d470
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3029263

Change-Id: Ic59f2fd2ac5624c2b7e8bd5990d62511b1164485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 01:34:27 +00:00
Treehugger Robot
4eecd990d9 Merge "Add more comments about soong config variables" into main 2024-04-23 01:14:46 +00:00
Treehugger Robot
d47220d470 Merge "Add support to Soong config list variable" into main 2024-04-23 01:14:44 +00:00
Ellen Arteca
810c37ec1e Adds support to bindgen to handle static inline fcts
Adds support for bindgen to be able to handle `static inline`
functions. This is done by adding a new boolean field to the `BindgenProperties`
struct, `Handle_static_inline` (default to false).
If this field is true, then the flags to trigger bindgen support of
static inline functions are passed in.

The rust-bindgen documentation list two ways of handling `static inline`
functions, both specified with command line args.
1) --generate-inline-functions
2) --experimental --wrap-static-fns

Option 1 requires some extra effort on the part of the C library developer, in
that they have to expose the function symbols: the docs (linked below) explain
that this is often done by compiling the library with inlining disabled, which
can be detrimental to performance.

Option 2 requires no effort on the part of the C library developer, but it does
require the `--experimental` flag, since this feature is still under development.

This CL goes with option 2.

Relevant docs: https://github.com/rust-lang/rust-bindgen/discussions/2405

This CL also adds a new test: TestBindgenHandleStaticInlining in bindgen_test.go

Test: m blueprint_tests
Change-Id: If28000e3f3ccecc65c4cae1c62d7bf455454239a
2024-04-23 00:48:25 +00:00
Treehugger Robot
0a8f7741fd Merge "PackageFile for permission/*.xml for sdk_library" into main am: b0a4e48c15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3053562

Change-Id: I570b488c7247316640932346612953f4002a2003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 23:24:17 +00:00
Treehugger Robot
b0a4e48c15 Merge "PackageFile for permission/*.xml for sdk_library" into main 2024-04-22 23:20:39 +00:00
Treehugger Robot
ee421a7c5f Merge "Include stubs type in metalava.rsp filename" into main am: affbd19c64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3053403

Change-Id: I03e213934a25c3935312157bbfa811c09da592ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 23:17:33 +00:00
Yi Kong
49a29d0f9d Merge "Revert^3 "Upgrade to clang-r522817"" into main am: aff61bf52e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3053802

Change-Id: Idb492fab83ca27b9919bc370e20cdbc297b52fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 23:16:33 +00:00
Treehugger Robot
affbd19c64 Merge "Include stubs type in metalava.rsp filename" into main 2024-04-22 23:15:59 +00:00
Yi Kong
aff61bf52e Merge "Revert^3 "Upgrade to clang-r522817"" into main 2024-04-22 23:05:29 +00:00
Yi Kong
33fb507271 Revert^3 "Upgrade to clang-r522817"
This reverts commit 7a4012586b.

Still more build breakages...

Change-Id: I2081d68e37bf260da78c651bb8fb9ae0d05b4c37
2024-04-22 23:04:07 +00:00
Paul Duffin
0a71d7329d Use new --api-lint-previous-api
Bug: 327019023
Test: ./gradlew
Change-Id: Ief4d7380e7242dff4e82df96778af17d56c4fe82
2024-04-22 23:48:19 +01:00
Jihoon Kang
421c1cd796 Include stubs type in metalava.rsp filename
Currently, metalava.rsp filepath for both the everything and the
exportable stubs type are identical, which may lead to incremental build
issues. This change resolves such issue by including the stubs type in
the metalava.rsp filename.

These files cannot be modified as ".../everything/metalava.rsp" and
".../exportable/metalava.rsp" as `FlagWithRspFileInputList(...)`
enforces the rsp filepath to be outside of the outdir, which is
".../everything/" and ".../exportable/", respectively. Thus, this change
continues to generate the rsp file to be generated in the module outdir,
but modifies the name of the rsp files as "everything.metalava.rsp" and
"exportable.metalava.rsp".

This change also simplifies the parameters in metalavaCmd(...) for the
simplicity of the method parameters.

Test: m nothing and inspect output for the everything and the exportable stubs
Bug: 336360490
Change-Id: Ifd4e89ef69808e79ea720199677585f0217f7c1c
2024-04-22 21:29:05 +00:00
Jeongik Cha
00e0991f70 PackageFile for permission/*.xml for sdk_library
Bug: 333311683
Test: build android.bp system image and then check if there is
permission xml file for sdk_library

Change-Id: If5ac1975a7db10d85a1b11c1cd666051e3da546e
2024-04-23 05:49:44 +09:00
Colin Cross
2d67bcba1d Merge "Remove more unused code" into main am: a17792e2eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3038267

Change-Id: I2059c16492fa27e4a4a93518ef69a45a4f655f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 19:05:25 +00:00
Colin Cross
c955bda138 Merge "Convert apex mutator to a TransitionMutator" into main am: 757e88a9df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3042819

Change-Id: I8f0f3cde2f543007e4971c4a43cd5af5051b308b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 19:04:56 +00:00
Colin Cross
a17792e2eb Merge "Remove more unused code" into main 2024-04-22 18:50:08 +00:00
Colin Cross
757e88a9df Merge "Convert apex mutator to a TransitionMutator" into main 2024-04-22 18:32:22 +00:00
Cole Faust
23ef23b107 Merge "Revert^2 "Make embedded_launcher true by default"" into main am: 68305164c3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3047058

Change-Id: I13cadd57b8d704e447e06ecb7160f56b9d4fd9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 17:43:52 +00:00
Cole Faust
68305164c3 Merge "Revert^2 "Make embedded_launcher true by default"" into main 2024-04-22 17:40:11 +00:00
Yi Kong
bece6e0ee2 Merge "Revert^2 "Upgrade to clang-r522817"" into main am: 7252e3289d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3050984

Change-Id: I72cef4bd23cdc5874be1d725165db9cd8c9d5ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 17:40:07 +00:00
Yi Kong
7252e3289d Merge "Revert^2 "Upgrade to clang-r522817"" into main 2024-04-22 17:06:24 +00:00
Rico Wind
7152e82a42 Enable non final ids for non BusyBox builds
Non final ids is a prerequisite for using optimized shrinking and
it will soon be a hard R8 error if you pass final ids in R classes
with optimized shrinking enabled.

Bug: 325905703
Test: SystemUIGo with optimized shrinking
Change-Id: I364edc5a0b22be7b4d737c2aa470a84704d05283
2024-04-22 11:24:36 +00:00
Sorin Basca
0dbffbcee4 Merge "Add Java 21 as a known version" into main am: db70a80cc7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3048694

Change-Id: I437a09346d2d5eb1c045128bf0960ed85dad28e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 07:27:54 +00:00
Yi Kong
7a4012586b Revert^2 "Upgrade to clang-r522817"
This reverts commit 321dd23b34.

Breakage is fixed by https://r.android.com/3051002.

Change-Id: I70925c7aa01fb78ec701971ee97192993aef0edd
Test: abtd
Bug: 322868540
2024-04-22 07:22:02 +00:00