Inseob Kim
155eb6e21d
Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main am: 7d7baf7220
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195633
Change-Id: I35846419402c7a0cb075278ef1f9b83bff81aa88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 02:51:18 +00:00
Inseob Kim
7d7baf7220
Merge changes from topic "revert-3184480-system_build_prop_soong-BZIDUTEOOC" into main
...
* changes:
Revert "Add TARGET_SYSTEM_PROP to system build.prop"
Revert "Sync gen_build_prop.py to sysprop.mk"
Revert "Use Soong-built system/build.prop"
2024-07-25 02:48:23 +00:00
Inseob Kim
027f50246f
Revert "Add TARGET_SYSTEM_PROP to system build.prop"
...
Revert submission 3184480-system_build_prop_soong
Reason for revert: breaks ndk and mainline build
Reverted changes: /q/submissionid:3184480-system_build_prop_soong
Change-Id: Ic089dc3dfcbf2083d1bcf2413be432dcb61ce525
2024-07-25 02:45:53 +00:00
Inseob Kim
c8a68e841f
Add TARGET_SYSTEM_PROP to system build.prop am: bcc00559c6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3182381
Change-Id: Ib1ba1c34304b6ae7b1a7833603162c438ec5ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-25 02:08:22 +00:00
Inseob Kim
b93b9f0b3a
Merge changes from topic "system_build_prop_soong" into main
...
* changes:
Use Soong-built system/build.prop
Sync gen_build_prop.py to sysprop.mk
Add TARGET_SYSTEM_PROP to system build.prop
2024-07-25 02:07:00 +00:00
Inseob Kim
bcc00559c6
Add TARGET_SYSTEM_PROP to system build.prop
...
System partition's build_prop output now contains TARGET_SYSTEM_PROP.
Soong needs to know paths to add them to ninja build dependency graph.
Bug: 322090587
Test: build and compare both build.prop files
Change-Id: Ide73e876d28eda0cced2ec08bd3c680115025ad8
2024-07-24 15:53:54 +09:00
Kiyoung Kim
8a2bef0adb
Merge "Remove VSDK related code from build" into main am: e51cb36a48
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3188060
Change-Id: I676c7500fc17b602d0535c2edfb07376c4be538e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-24 03:52:43 +00:00
Kiyoung Kim
a7510851ea
Remove VSDK related code from build
...
Remove leftover VSDK related code from build, as they are no longer in
use.
Bug: 332986564
Test: AOSP CF build succeeded
Change-Id: I7dcec66ddf6ee9a563ac09a3fa8a282c9e00258a
2024-07-23 12:18:45 +09:00
Treehugger Robot
b8dd8b1e05
Merge "Add 'use_debug_art' to product_variable" into main am: 00abdc02de
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3160220
Change-Id: Ia654e2b75c8341f1a64a0bc63c811485c169de6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-19 03:36:13 +00:00
Kiyoung Kim
881e465fda
Add 'use_debug_art' to product_variable
...
Add 'use_debug_art' property to product_variable so it can be checked
from Android.bp whether ART debug APEX or ART APEX should be used.
Bug: 351698657
Test: AOSP CF eng build succeeded
Test: AOSP CF userdebug build succeeded
Change-Id: I01cd80f0d899c55828ecb05fdafdc9bb05fd8200
2024-07-18 13:25:18 +09:00
Taylor Santiago
3c16e61c57
Add ABFS (Android Build Filesystem) configuration option to Soong
...
Change-Id: Ibbe81004adc67b1212d7e619a35f7425bfee0d72
2024-07-17 14:50:25 -07:00
Treehugger Robot
c8c78e961e
Merge "Define otacerts_zip module in soong" into main am: 2fb3964e21
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3160437
Change-Id: I8523694c1a3faefc4bb5b1aee5a096220a068c9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-04 23:17:22 +00:00
Justin Yun
635e788274
Define otacerts_zip module in soong
...
To move the otacerts module from make to soong, define a new module
type otacerts_zip module. This module collects key files from
PRODUCT_DEFAULT_DEV_CERTIFICATE and PRODUCT_EXTRA_OTA_KEYS
(PRODUCT_EXTRA_RECOVERY_KEYS for recovery) to install the zipped file
in etc.
otacerts_zip module is available to recovery to install the
otacerts.zip file in the recovery partition.
Bug: 335364209
Test: Define "PRODUCT_DEFAULT_DEV_CERTIFICATE := \
build/make/target/product/security/testkey" and
m aosp_cf_system_x86_64
Change-Id: Ib5b671e9caef0403c6d9d69bfab29be248d7086c
2024-07-04 15:56:36 +09:00
Xin Li
037736c1d0
Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future
2024-06-20 19:38:53 +00:00
Inseob Kim
9687618816
Merge "Add build_prop soong module" into main
2024-06-19 03:26:37 +00:00
Inseob Kim
2da72af53a
Add build_prop soong module
...
build_prop is a soong module generating {partition}/build.prop. It's
ported from build/make/core/sysprop.mk and will replace sysprop.mk in
the future. Currently used only by Android.bp cuttlefish system image.
Bug: 322090587
Bug: 346214958
Test: compare system/build.prop and aosp_cf_x86_64_system-build.prop for
eng / user / userdebug
Change-Id: Iad76139fe86ec4f582218c185aa15baeacaa38dc
2024-06-19 10:42:07 +09:00
LaMont Jones
21d04d99c8
Add RELEASE_ACONFIG_EXTRA_RELEASE_CONFIGS
...
This build flag causes us to create aconfig flag artifacts for the
given extra release configs.
Bug: 298444886
Test: manual
Change-Id: I10148f6e7318b0477438ed1d8baafbf4dc594c90
2024-06-18 17:16:42 -07:00
Xin Li
f9fc13dd78
Merge "Merge Android 14 QPR3 to AOSP main" into main
2024-06-17 18:51:33 +00:00
Cole Faust
be0f95b374
Merge "Remove saveToBazelConfigFile" into main am: ba80e4c16b
am: 2ce7466a03
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132087
Change-Id: I91a4d8f8017d3a81536619eb436d42427db48918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-14 23:35:40 +00:00
Cole Faust
2ce7466a03
Merge "Remove saveToBazelConfigFile" into main am: ba80e4c16b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3132087
Change-Id: I4606bb743cab751bd9411871806b92be8fcbbd41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-14 23:27:54 +00:00
Cole Faust
ad18649d29
Remove saveToBazelConfigFile
...
Bug: 315353489
Test: Presubmits
Change-Id: I781f0fd9d0241b9742b0b84f5df4088e7bba16c7
2024-06-14 14:13:54 -07:00
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