Commit Graph

851 Commits

Author SHA1 Message Date
Treehugger Robot
7a1af804d8 Merge "Drop IncludeTags" into main am: 211fdd6618 am: 98f7f32ba0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3098657

Change-Id: I83156dae3070ea13b5afa9ded2171100fedb9f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 22:38:45 +00:00
Treehugger Robot
98f7f32ba0 Merge "Drop IncludeTags" into main am: 211fdd6618
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3098657

Change-Id: I7bbd91db4f4309f8a8c0e558bf901a351ed20c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 22:16:18 +00:00
Treehugger Robot
211fdd6618 Merge "Drop IncludeTags" into main 2024-06-06 22:12:38 +00:00
Treehugger Robot
ef9fd50b23 Merge "Disallow unknown fields in soong variables file" into main am: 4eef64a70b am: 142cf7a304
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114140

Change-Id: I2b5e0f4615f90809a32e1a596dda4c30441dd7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 18:29:17 +00:00
Treehugger Robot
142cf7a304 Merge "Disallow unknown fields in soong variables file" into main am: 4eef64a70b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114140

Change-Id: I79650c9d87247d91f9a33454a1ff7e3e3a7abeef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 18:07:14 +00:00
Treehugger Robot
4eef64a70b Merge "Disallow unknown fields in soong variables file" into main 2024-06-06 17:51:57 +00:00
Steven Moreland
ce78db081d Merge "Shipping_api_level in build." into main am: c562e50fe5 am: baaeddbdca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3112267

Change-Id: I28e5cff14a84bf6c5e79f9237ffa457ae660e56e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 20:00:38 +00:00
Steven Moreland
baaeddbdca Merge "Shipping_api_level in build." into main am: c562e50fe5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3112267

Change-Id: Ieae74f8a9f904cbdffd05ccc88bce407a25b703a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 19:36:09 +00:00
Steven Moreland
c562e50fe5 Merge "Shipping_api_level in build." into main 2024-06-05 19:23:20 +00:00
Steven Moreland
a48df2b7fb Shipping_api_level in build.
Add shipping API level to build, so that we can move
certain tests to build time.

Bug: 340953047
Test: works in init for build time host checks
Change-Id: Ic89066c2b49089da3113a1afef1d39de53b307d9
2024-06-04 23:08:20 +00:00
Cole Faust
e1129b8cc6 Disallow unknown fields in soong variables file
To catch issues earlier, like when renaming a field.

Test: Presubmits
Change-Id: Ie04507b54cc8de3efd27ee75ff32a85ea21b5750
2024-06-04 11:10:11 -07:00
Kiyoung Kim
8f05c54b9d VNDK is fully deprecated from Soong
VNDK is fully deprecated, so KeepVndk variable will have fixed value.
This change removes KeepVndk config value, and updates any logic using
the value as VNDK is always deprecated.

Bug: 330100430
Test: Soong tests passed
Ignore-AOSP-First: Resolve merge conflict
Change-Id: I98b7590c059883e06bf3fb236d88966de64991d7
Merged-In: I98b7590c059883e06bf3fb236d88966de64991d7
2024-06-04 01:09:15 +00:00
Kiyoung Kim
48ebc86a8f Merge "VNDK is fully deprecated from Soong" into main 2024-06-04 00:48:12 +00:00
Alyssa Ketpreechasawat
fbce223d34 Merge "Add RELEASE_APEX_CONTRIBUTIONS_TELEMETRY_TVP build flag" into main am: 4aff462533 am: 54ddc87436
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106710

Change-Id: I09212467bf67692c6571ef1f4bb59e4cc5001895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 08:47:08 +00:00
Alyssa Ketpreechasawat
dcda1c8906 Add RELEASE_APEX_CONTRIBUTIONS_TELEMETRY_TVP build flag
Bug: 342624660
Test: check com.google.mainline.go.telemetry_tplus in out/soong/prebuilt_info.json (go target)
Change-Id: I201b58c08772669b54c396b4c4dbeccbb4b5147c
2024-05-30 20:24:29 +00:00
Kiyoung Kim
97974dfa04 VNDK is fully deprecated from Soong
VNDK is fully deprecated, so KeepVndk variable will have fixed value.
This change removes KeepVndk config value, and updates any logic using
the value as VNDK is always deprecated.

Bug: 330100430
Test: Soong tests passed
Ignore-AOSP-First: Resolve merge conflict
Change-Id: I98b7590c059883e06bf3fb236d88966de64991d7
2024-05-30 10:15:17 +09:00
Kiyoung Kim
1838595ad8 Merge "Remove VndkUseCoreVariant related code from build" into main am: 60cec95e01 am: f204f58469
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3102677

Change-Id: I64306d029ba179d51d6ece51089eeb258a288ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:54:06 +00:00
Kiyoung Kim
22152f6cda Remove VndkUseCoreVariant related code from build
VndkUseCoreVariant feature is deprecated along with VNDK. This change
removes related code from Soong.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: Ie182c9e4dc9cf0a4fe9d5fddf5b36754ddb53d18
2024-05-24 10:45:28 +09:00
Treehugger Robot
cc2b4f482e Merge "Allow experimental Java target 21 by default" into main am: bc44eb03db am: 1e6f57b6dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3099283

Change-Id: Icbd72acac5b729b16b71c3fac4d55ca29232163a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 17:51:23 +00:00
Sorin Basca
253f8c045a Allow experimental Java target 21 by default
Bug: 342332820
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_21=true m
Change-Id: I6cc21bf191385df91c2446b7cd6291a0e3532bea
2024-05-23 10:28:24 +01:00
Spandan Das
aa9369b71d Drop IncludeTags
This was previously used in conjunction with blueprint_package_includes
to prune Android.bp files from soong analysis.

Test: m nothing
Bug: 308188212
Change-Id: Ie82e20eec63bd0be70e1cf0290c70f62d5621c76
2024-05-22 19:23:47 +00:00
Treehugger Robot
6653d8c4ff Merge "Add RELEASE_APEX_CONTRIBUTIONS_PRIMARY_LIBS build flag" into main am: 1dbb9d91ce am: 9fb76d9594
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3079430

Change-Id: I172018e37aa939f9de327ebeb9fbc7f691c6b171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-09 23:00:20 +00:00
Pedro Loureiro
57b1b6802f Add RELEASE_APEX_CONTRIBUTIONS_PRIMARY_LIBS build flag
Bug: 339132327

Test: m out/soong/prebuilt_info.json
Test: manually inspect that json file
Change-Id: Ib20164c82316fe02fe04a52461e344f1dfb03b90
2024-05-09 16:11:05 +00:00
Aditya Kumar
214802ef28 Merge "IsEnvTrue and IsEnvFalse should take True and False as valid values respectively." into main am: c9b4d4c584 am: caaf53d286
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070703

Change-Id: Idc4c14a8e12483006c59af77f2922226bb1e217d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:49:59 +00:00
Aditya Kumar
c9b4d4c584 Merge "IsEnvTrue and IsEnvFalse should take True and False as valid values respectively." into main 2024-05-02 18:14:59 +00:00
AdityaK
1938410342 IsEnvTrue and IsEnvFalse should take True and False as valid values respectively.
Change-Id: Ibca5800c0846a45e3811db76fb5ad46b8a7eb1c1
2024-05-01 13:51:25 -07:00
Treehugger Robot
ca8298793e Merge "Add RELEASE_APEX_CONTRIBUTIONS_MODULE_METADATA build flag" into main am: 83ede7c225 am: d8e8238c3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066190

Change-Id: If402110c189dac85f945ed08000e3c60c26e2a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 18:29:18 +00:00
Treehugger Robot
83ede7c225 Merge "Add RELEASE_APEX_CONTRIBUTIONS_MODULE_METADATA build flag" into main 2024-05-01 18:06:00 +00:00
Spandan Das
dab69e1001 Add RELEASE_APEX_CONTRIBUTIONS_MODULE_METADATA build flag
This can be used to select a specific prebuilt ModuleMetaData prebuilt

Test: go build ./android
Bug: 338003071
Change-Id: Ia96ba102107161021c78ad3f87a938f8a788e932
2024-04-30 18:14:49 +00:00
Ted Bauer
205f08b7ad Drive instrumentation with build flag for C/C++ am: 10fff94e2e am: c19dfaf9d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3065602

Change-Id: I04dc519f2bb9a3304071ac5430ead38405a2326d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 22:03:21 +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
Linus Tufvesson
ee76dc3e21 Update soong to use flag for min supported sdk am: ba270c503a am: 5c7b9120c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037607

Change-Id: I235a8af79b560c3cb7558d05eaa54b22e880112d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 09:58:18 +00:00
Linus Tufvesson
5c7b9120c5 Update soong to use flag for min supported sdk am: ba270c503a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037607

Change-Id: I647dc57aafe68ad0ff4b97e6c558737daabc5303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 09:28:39 +00:00
Linus Tufvesson
ba270c503a Update soong to use flag for min supported sdk
Test: Build and flash
Test: adb shell getprop ro.build.version.min_supported_target_sdk
Bug: 297603927
Change-Id: I5123c58c8397ae44f163c2c2ee557dce9b0437c1
2024-04-16 08:08:59 +00:00
Hsin-Yi Chen
66245afd1a Merge "Filter ABI dumps by LLNDK headers and version scripts" into main am: 1edffe1dc4 am: 1ad665f20c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3019094

Change-Id: Icc18d4dad1549d96c6147b3f2f3e44771efed10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 09:13:04 +00:00
Hsin-Yi Chen
1ad665f20c Merge "Filter ABI dumps by LLNDK headers and version scripts" into main am: 1edffe1dc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3019094

Change-Id: Icd5bf9027880a22ebf71ae0a8667a7d873ad401a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-10 08:58:20 +00:00
Hsin-Yi Chen
1edffe1dc4 Merge "Filter ABI dumps by LLNDK headers and version scripts" into main 2024-04-10 08:36:07 +00:00
Hsin-Yi Chen
64b2d0389c Filter ABI dumps by LLNDK headers and version scripts
This commit changes the parameters to create LLNDK ABI dumps for 202404
and later versions. Soong invokes header-abi-linker with LLNDK headers
and version script rather than the implementation library's parameters.
The output dump contains more precise ABI information.

When soong compares the ABI with the prebuilt dumps in old versions,
it creates the source ABI dumps with the old parameters.

Test: make findlsdumps
Bug: 314010764
Change-Id: I228736188d07029ee1588b3502fd7c0061c104b9
2024-04-09 18:45:03 +08:00
Treehugger Robot
8418f7c60a Merge "Remove Device VNDK version usage from Soong" into main am: ed2adb879f am: 8a57bcba2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3027063

Change-Id: Iee85ae97d1d4337aec6589f5adb30f23e6adc153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 20:08:28 +00:00
Treehugger Robot
8a57bcba2f Merge "Remove Device VNDK version usage from Soong" into main am: ed2adb879f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3027063

Change-Id: Ib01a6ccb4e7074897d913cfb3ae47aef1cc153d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 19:47:41 +00:00
Treehugger Robot
ed2adb879f Merge "Remove Device VNDK version usage from Soong" into main 2024-04-08 19:24:36 +00:00
Kiyoung Kim
4e765b1bfc Remove Device VNDK version usage from Soong
As of VNDK deprecation, Device VNDK version should no longer be used
from build. This change removes all references on Device VNDK version
and related logic with it.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: Ibc290f0b41e8321f80c75c69f810223989af68dc
2024-04-05 01:57:32 +00:00
Spandan Das
b00d52d523 Merge "Convert BuildIgnoreApexContritbutions variable to a boolean" into main 2024-04-04 17:50:48 +00:00
Dennis Shen
58378c9dbc use build system flag RELEASE_READ_FROM_NEW_STORAGE to drive codegen
When RELEASE_READ_FROM_NEW_STORAGE is true, enable reading from new
storage. So that we can ensure nextfood is not impacted.

Ignore-AOSP-First: code only needed for git_main, and will be removed once test mission 1 is finished.

Bug: b/332737012
Test: m
Change-Id: Ide3f432321ebd3dce9427e7cb8f2086e24d3cc31
2024-04-03 19:35:25 +00:00
Kiyoung Kim
2f4aef599a Merge "Remove PlatformVndkVersion property" into main am: 6954bd2337 am: 762d78f2f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000610

Change-Id: I17ec9730acd6e458fdfab61fa3a304b3761e35ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-03 01:39:34 +00:00
Spandan Das
0d24adea73 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-03 01:02:00 +00:00
Kiyoung Kim
fa13ff194c Remove PlatformVndkVersion property
Platform VNDK version is no longer available based on VNDK deprecation.
Remove all code using Platform VNDK version.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: I7d0f7e23eff5d153346890f242a94b78bad6736b
2024-04-01 16:37:20 +09:00
Treehugger Robot
6305784ed5 Merge "Reland "Migrate buildinfo.sh script into Soong"" into main am: b30c12ee2f am: 49e0ec065a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3015794

Change-Id: I1fdfa5cf1b461aa8c72708b5c2fd32a689a3e79a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-28 03:35:48 +00:00
Inseob Kim
8fa54dab08 Reland "Migrate buildinfo.sh script into Soong"
To build system.img in Soong, we need all artifacts including
build.prop. This fully migrates buildinfo.prop file into Soong as a
first step to build build.prop on Soong.

This fixes an error caused by an incorrect path to build thumbprint
file.

Bug: 322090587
Test: compare build.prop before and after
Test: build multiple times and see build.prop isn't rebuilt
Change-Id: Id4fa830009538856c30825ff47268b11fa6cb5d6
2024-03-27 14:18:45 +09:00