Commit Graph

81862 Commits

Author SHA1 Message Date
Cole Faust
cd1add3a69 Add test for configurable defaults applied to multiple modules am: 693494682f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3063444

Change-Id: I5d89292e15a5c3f633ffc607f63645f92c32d053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 01:47:33 +00:00
Spandan Das
d977ad2989 Convert BuildIgnoreApexContritbutions variable to a boolean
(This relands aosp/3007754. The previous sdk build failures have been
resolved now)

The ignore list is burdensome to maintain once we start adding the
module sdk contents to apex_contributions. Convert the variable to a
boolean. When set to true, all contents in `apex_contributions` will be
ignored

Bug: 308187268
Test: m nothing on aosp,google and google_fullmte devices
Merged-In: Ibdd1e0d0d4f08f4f5251b9c4baa1aaf42e7df34f
(cherry picked from commit f3df7305d653471c70d131177e773b4723247e3a)
Change-Id: I9d57d899c6a9a321e2eb3579c954641f2cb04709
2024-04-29 23:40:37 +00:00
Ted Bauer
c19dfaf9d6 Drive instrumentation with build flag for C/C++ am: 10fff94e2e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3065602

Change-Id: Ie46b65da536109501103fd6cf85c3ab475a2de12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 21:44:29 +00:00
Ted Bauer
10fff94e2e Drive instrumentation with build flag for C/C++
Bug: 328444881
Test: m
Change-Id: I20c92c61f855adb772d6aa173e85a6d8092460d7
2024-04-29 19:53:43 +00:00
Paul Duffin
da620a16b6 Merge "Pass API surface specific extension jars to Metalava" into main am: 6f581637c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3061686

Change-Id: Iaa1c79e57f5aba0e21fc2811b28e670539b8357f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 19:33:58 +00:00
Paul Duffin
6f581637c1 Merge "Pass API surface specific extension jars to Metalava" into main 2024-04-29 19:19:16 +00:00
LaMont Jones
bc3e82a2fc Merge "release_config: container is a repeated string field" into main am: f6aa6754a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3064406

Change-Id: Icde4da3218b96398099e02e7c857029106e49316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 17:46:12 +00:00
LaMont Jones
f6aa6754a2 Merge "release_config: container is a repeated string field" into main 2024-04-29 17:25:03 +00:00
Ted Bauer
ef05b58774 Merge "Switch libbase to shared" into main am: 84835f48ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3065162

Change-Id: I1398d12be4a7334b2c280479ba246c333babc414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 17:10:03 +00:00
Ted Bauer
84835f48ea Merge "Switch libbase to shared" into main 2024-04-29 16:47:45 +00:00
Ted Bauer
6c69edfbf1 Switch libbase to shared
Test: m
Bug: 328444881
Change-Id: Ia232859bcc6591e26eb244d8c3f15336204a460e
2024-04-29 15:05:57 +00:00
Hsin-Yi Chen
11f24228db Merge "Let header-abi-linker filter llndk, apex, and systemapi symbols" into main am: d32e3dff8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3040334

Change-Id: I2f390a0bf19606330bc6bef78c85f2ebf08f1c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 08:14:37 +00:00
Hsin-Yi Chen
d32e3dff8d Merge "Let header-abi-linker filter llndk, apex, and systemapi symbols" into main 2024-04-29 07:43:57 +00:00
LaMont Jones
db600990a5 release_config: container is a repeated string field
Container is a string, and a flag can be in more than one container.

Bug: 328495189
Test: manual
Change-Id: I5a2a9855532027584d2b67f63f1b9584fce3d8d9
2024-04-26 14:56:58 -07:00
Cole Faust
693494682f Add test for configurable defaults applied to multiple modules
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I510472a81ae682e5a55171ec4a9aec420d577307
2024-04-26 12:37:57 -07:00
LaMont Jones
127dd94bf9 Merge changes I708c37f9,I577e7fb0 into main am: 2d5e7579d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3063016

Change-Id: I9578295b5abd5dcea6dc388f9e44958572e6766b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 18:54:05 +00:00
LaMont Jones
2d5e7579d4 Merge changes I708c37f9,I577e7fb0 into main
* changes:
  Write per-partition build_flags.json
  release_config: various cleanup
2024-04-26 18:53:41 +00:00
Jeff DeCew
28f8546ea0 Merge "Ensure aconfig generated CustomFeatureFlags is renamed by JarJar" into main am: 996c883b65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3058302

Change-Id: I48fa1ec892df6c2757cd4eaa4cc4c2ef189be928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 18:53:35 +00:00
Jeff DeCew
996c883b65 Merge "Ensure aconfig generated CustomFeatureFlags is renamed by JarJar" into main 2024-04-26 18:39:43 +00:00
LaMont Jones
f4cc08e114 Write per-partition build_flags.json
Create build_flags_{partition}-{TARGET_PRODUCT}-{TARGET_RELEASE}.json
in {OUT_DIR}/soong/release-config.

Bug: 328495189
Test: manual
Change-Id: I708c37f9b1216b4283886c98cacaf66bfcd28143
2024-04-26 09:24:47 -07:00
Ted Bauer
60462974fa Merge "Switch to static deps" into main am: 8e4060abc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3062942

Change-Id: I25c2d5c120a61a7403cd55912f0be1abd80f35c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 15:32:54 +00:00
LaMont Jones
15788829b2 release_config: various cleanup
- Parse release_config_map.textproto files only once
- Fix inheritance
- Sort flag artifacts by flag name
- Add --all_make option for testing
- Fix value() parsing in crunch_flags

Bug: 328495189
Test: manual
Change-Id: I577e7fb07171bea9a53d61eaf77ec728b60d7a26
2024-04-26 08:28:39 -07:00
Ted Bauer
8e4060abc5 Merge "Switch to static deps" into main 2024-04-26 15:09:20 +00:00
Ted Bauer
1e96f8c622 Switch to static deps
Bug: 328444881
Test: m
Change-Id: I53ad95ca281031ec98d5df66ada0ed69749da312
2024-04-26 13:46:09 +00:00
Yu Liu
b294cc6caa Merge "Only link the profile extras lib for device variant for rust." into main am: 24cd8c3756
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3047059

Change-Id: I346191a670d4d150c6ca02a89e5057f58ec5c721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 23:07:53 +00:00
Yu Liu
24cd8c3756 Merge "Only link the profile extras lib for device variant for rust." into main 2024-04-25 22:45:57 +00:00
Colin Cross
f1a5c23c92 Allow overriding android_library_import manifests am: 21ed4694c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3056926

Change-Id: I0db89917966a2a7543310122e7eef89d93cda497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 22:24:00 +00:00
Colin Cross
21ed4694c5 Allow overriding android_library_import manifests
Some of the androidx libraries have a transformed manifest
alongside that needs to be used to avoid introducing extra
androidx.startup provider entries.  Add a manifest property
that allows overriding the manifest provided by the aar file.

Bug: 336549758
Test: examine PermissionController.apk
Ignore-AOSP-First: submitting in topic with internal CL
Merged-In: I5c8daf810d2fde9a150cbfe48b4f4216f5d1ba0d
Change-Id: I5c8daf810d2fde9a150cbfe48b4f4216f5d1ba0d
2024-04-25 20:46:22 +00:00
Paul Duffin
58cfc9af9b Pass API surface specific extension jars to Metalava
Previously, it would only pass `public` extension jars. This change
fixes that so it passes the jars for the API surface being generated.

Bug: 336993217
Test: m out/target/common/obj/PACKAGING/api_versions_public_generated-api-versions.xml \
        out/target/common/obj/PACKAGING/api_versions_system_generated-api-versions.xml
      # Compare the following files to make sure that they include public extension
      # APIs and system extension APIs respectively.
      diff \
          out/soong/.intermediates/frameworks/base/api/api_versions_public/android_common/*/metalava_exportable.sbox.textproto \
          out/soong/.intermediates/frameworks/base/api/api_versions_system/android_common/*/metalava_exportable.sbox.textproto
Change-Id: I02e2ec3c8176cfbc3cbd8ac56fb78d12b765eedb
2024-04-25 19:04:32 +01:00
Hsin-Yi Chen
c218966228 Merge "Split APEX ABI dumps from implementation ABI dumps" into main am: 473b3557f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3039156

Change-Id: Ica7cf3d1d28f313bc8d9fb9ba33df1a6d3643d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 15:26:20 +00:00
Hsin-Yi Chen
f6fc525a1a Let header-abi-linker filter llndk, apex, and systemapi symbols
This commit adds --include-symbol-tag and --symbol-tag-policy to
header-abi-linker commands. The arguments make header-abi-linker load
the symbols tagged with llndk/apex/systemapi from the version script.
It filters the function declarations by the symbols. The output dumps
will not contain unfinalized ABI.

Test: make findlsdumps
Bug: 333532038
Change-Id: I28234a3749f389b8a5a09ac84341b1fcd1ee88a6
2024-04-25 23:11:49 +08:00
Hsin-Yi Chen
473b3557f1 Merge "Split APEX ABI dumps from implementation ABI dumps" into main 2024-04-25 14:58:20 +00:00
Hsin-Yi Chen
98da02128c Split APEX ABI dumps from implementation ABI dumps
This commit adds a rule that builds APEX ABI dumps separately from the
implementation libraries' ABI dumps. The rule takes the
export_include_dirs and the symbol_file of the stubs as parameters.
The dump paths are tagged with "APEX" in lsdump_paths.txt. The script
updating the prebuilt reference dumps can differentiate the APEX dumps
from the opt-in dumps tagged with "PLATFORM".

This commit also adds an ABI diff rule. Soong compares the APEX ABI
dumps with the reference dumps in version 35. It compares the
implementation dumps with the reference dumps in old versions.

Bug: 333532038
Test: make
Change-Id: I76902a8e3b7d0e96a5ad756f493924371cd7ad3c
2024-04-25 17:57:29 +08:00
Treehugger Robot
19b79bb9ea Merge "add flag_value.redacted" into main am: a559cab24a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3059303

Change-Id: If164d85e6b3b27e505255e62a638551bd1d6aa18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 00:21:32 +00:00
Treehugger Robot
153b8204ac Merge "Shard rust protobuf sources" into main am: c66702491f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3055346

Change-Id: Iee3f84e33a69649e85bc219d363a5f662caedba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 00:21:12 +00:00
Treehugger Robot
a559cab24a Merge "add flag_value.redacted" into main 2024-04-25 00:13:34 +00:00
Treehugger Robot
c66702491f Merge "Shard rust protobuf sources" into main 2024-04-24 23:02:54 +00:00
Treehugger Robot
3950d06ea1 Merge "crunch_flags: keep-sorted lines are not descriptions" into main am: fa6dac201d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3048929

Change-Id: I9bbe691c55dfabe90e701a1caea7b928da47768d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-24 22:12:09 +00:00
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
Treehugger Robot
fa6dac201d Merge "crunch_flags: keep-sorted lines are not descriptions" into main 2024-04-24 21:39:32 +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
LaMont Jones
ccb2207cfa add flag_value.redacted
When set, this removes all traces of the flag from the release config.

Bug: 328495189
Test: manual
Change-Id: Iab39d06e134bfc020ba4875c1b8e89c5cdf18924
2024-04-24 13:06:14 -07:00
LaMont Jones
11209e1255 crunch_flags: keep-sorted lines are not descriptions
Also fix a typo in parsing declare-release-config.

Bug: 328495189
Test: manual, TH
Change-Id: Ibfed4a217275df0dd6bd9c2fb124e0d1f791be08
2024-04-24 13:05:55 -07: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
Jeff DeCew
4fd15223fe Ensure aconfig generated CustomFeatureFlags is renamed by JarJar
Bug: 336768870
Flag: NA
Test: presubmit
Change-Id: I40a2763724066118e051a9ca0b88e5a9e5d76adf
2024-04-24 14:25:38 +00:00