LaMont Jones
bae67b9994
Merge changes from topic "product-flags2" into main
...
* changes:
Reapply "release_config: build flags can be lists"
Reapply "Add support for product-specific build flags"
2023-11-07 20:12:50 +00:00
Cole Faust
5b8dda087d
Only allow .scl files to load other .scl files
...
.scl files are starlark configuraiont language files, which is starlark
without any of the bazel buildin symbols.
This is to match bazel's behavior, and it doesn't make sense for
scl files to load bzl files.
We should change all the release config bzl files to scl, and then
also make it so that when using executionModeScl you can only load
scl files.
Test: go test
Change-Id: I196bcf3a4548118791ed1d47c2d37e46a1ef86c4
2023-11-07 11:27:41 -08:00
Devin Moore
3ae48f2e66
Stop including android.hidl.memory ashmem impl on V+ devices
...
We no longer support HIDL in devices targeting Android V+ vendor.
Test: m && launch_cvd && adb shell ls /vendor/lib64/hw
Bug: 205764958
Change-Id: I6c528be1ae2bf34c790ab2efc83ce7a8db8c9770
2023-11-07 02:13:03 +00:00
Devin Moore
4859a6a250
Remove android.hidl.memory library from the VNDK
...
This is no longer going to be used in Android V+ device so remove it
from the VNDK.
Test: m
Bug: 205764958
Change-Id: I4f1fb8400a241961e577fbc2afb2730299a884c6
2023-11-06 23:35:48 +00:00
Colin Cross
83736642f0
Merge "Revert "Reapply "Add support for product-specific build flags""" into main am: 5f24ce6158
am: 3e228c7063
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818085
Change-Id: I1196a669af64a661fdd8136b3df41d7581f0e933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 23:18:26 +00:00
Colin Cross
879284e93d
Merge "Revert "Reapply "release_config: build flags can be lists""" into main am: cc318d33e1
am: 336d458c50
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818084
Change-Id: Ieec484616be2f744998087809b498dec96ea46a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 23:18:22 +00:00
Colin Cross
aeb9e638de
Merge "Revert "Reapply "Add support for product-specific build flags""" into main am: 5f24ce6158
am: f78b8051d4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818085
Change-Id: I597708565095e6288cd92a56b1410f76a7d53f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 23:14:52 +00:00
Colin Cross
a914569a9d
Merge "Revert "Reapply "release_config: build flags can be lists""" into main am: cc318d33e1
am: 9717c3fe3c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818084
Change-Id: I9f84cc91fcaaaddb71e6a3f0b0d3b12648cb69ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 23:14:50 +00:00
Colin Cross
3e228c7063
Merge "Revert "Reapply "Add support for product-specific build flags""" into main am: 5f24ce6158
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818085
Change-Id: If2e2f47e8bd2e3d76feda72124784b5da4e59c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:47:41 +00:00
Colin Cross
336d458c50
Merge "Revert "Reapply "release_config: build flags can be lists""" into main am: cc318d33e1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818084
Change-Id: Iaee8f8106c5157e9f8f8b3aca8ae6d6bb2c629b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:47:36 +00:00
Colin Cross
f78b8051d4
Merge "Revert "Reapply "Add support for product-specific build flags""" into main am: 5f24ce6158
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818085
Change-Id: Iaaa94d9613c29e8f88a8a56e7a041e1b19935691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:45:30 +00:00
Colin Cross
9717c3fe3c
Merge "Revert "Reapply "release_config: build flags can be lists""" into main am: cc318d33e1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818084
Change-Id: I743e448c7ddabd29bc06110f99c6fe4abc4e5f66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:45:27 +00:00
LaMont Jones
2dae3d6b50
Reapply "release_config: build flags can be lists"
...
Allow a build flag definition to indicate that its value should be the
concatentation of assignements, rather than the final assigned value. In
this case, the "default" value from the flag definition is always
present as the start of the list.
The initial use case for this is RELEASE_ACONFIG_VALUE_SETS, where we
need apply multiple definition files that should be processed to arrive
at the final value.
Bug: b/302593603, b/304814040, b/309477343
Test: manual
Change-Id: I58eb71f2ee6d8f08f11a432993f23157831ec93c
2023-11-06 22:16:49 +00:00
LaMont Jones
38b195ea7e
Reapply "Add support for product-specific build flags"
...
1. release config maps now specify where the flag definitions are found.
2. PRODUCT_RELEASE_CONFIG_MAPS specifies additional release config map
files to use.
This allows product config to specify build flags, which can then be
specified by users of that product.
Bug: b/302593603, b/309477343
Test: manual
Change-Id: Ic1f0512ec4b06ac94dd3f29eadd6a03ba8ebf6d2
2023-11-06 22:15:19 +00:00
Treehugger Robot
fee15f90cb
Merge "Export build flags to soong." into main am: 1acc860f83
am: 1030fb06f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2795632
Change-Id: Ie26ad79492153702cccd6cee0b60599cdfdbea3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:05:41 +00:00
Treehugger Robot
c0cb8edeca
Merge "Export build flags to soong." into main am: 1acc860f83
am: 6ff3372545
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2795632
Change-Id: Iac2b1ebf70044c8474ed2e698eac333e5c35f9c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:02:57 +00:00
Colin Cross
5f24ce6158
Merge "Revert "Reapply "Add support for product-specific build flags""" into main
2023-11-06 22:02:50 +00:00
Colin Cross
cc318d33e1
Merge "Revert "Reapply "release_config: build flags can be lists""" into main
2023-11-06 22:02:50 +00:00
Colin Cross
671bc15286
Revert "Reapply "Add support for product-specific build flags""
...
Revert submission 2815850-product-flags
Reason for revert: b/309477343
Reverted changes: /q/submissionid:2815850-product-flags
Bug: 302593603
Bug: 309477343
Change-Id: I6294609d4c60973fceba567e37a6bc3b89239e42
2023-11-06 21:39:40 +00:00
Colin Cross
93b43efd80
Revert "Reapply "release_config: build flags can be lists""
...
Revert submission 2815850-product-flags
Reason for revert: b/309477343
Reverted changes: /q/submissionid:2815850-product-flags
Bug: 302593603
Bug: 309477343
Change-Id: Ifda3b0cdfb3524595af693156c6dc162c391a55a
2023-11-06 21:38:26 +00:00
Treehugger Robot
1030fb06f9
Merge "Export build flags to soong." into main am: 1acc860f83
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2795632
Change-Id: Ic17643c06edb3d3988bf6a09dbdc31d63004b0b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:34:22 +00:00
Treehugger Robot
6ff3372545
Merge "Export build flags to soong." into main am: 1acc860f83
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2795632
Change-Id: I61937fcf3be1caea530a1111565d07a9d570cff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:31:24 +00:00
Treehugger Robot
1acc860f83
Merge "Export build flags to soong." into main
2023-11-06 21:07:21 +00:00
Treehugger Robot
406262c553
Merge "Add PRODUCT_VALIDATION_CHECKS" into main am: 54e9262f99
am: ca14f7f971
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816880
Change-Id: If196f0a91b79ca64df818196356317d5b321666c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:52:43 +00:00
Treehugger Robot
c72c19927d
Merge "Add PRODUCT_VALIDATION_CHECKS" into main am: 54e9262f99
am: 6365c31102
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816880
Change-Id: I3fa85fbc16c894d0f04afdaf8751601128abe8c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:49:58 +00:00
Kelvin Zhang
65c1162eb5
Generate incremental OTAs for 16K/4K boot option
...
Previously, the 16K/4K boot options OTAs are full OTAs, resulting in
file size of ~20MB each, and ~40M for both OTAs. To reduce the space
usage, use incremental OTAs instead.
Test: th
Bug: 302759296
Bug: 293313353
Change-Id: I61cc84c6c13f151dd6bc5ff37dd31daa5fb31abd
2023-11-06 12:37:49 -08:00
Treehugger Robot
ca14f7f971
Merge "Add PRODUCT_VALIDATION_CHECKS" into main am: 54e9262f99
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816880
Change-Id: I89920199476b8dc129b339cf5d4ce1f4019496be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:21:30 +00:00
Treehugger Robot
6365c31102
Merge "Add PRODUCT_VALIDATION_CHECKS" into main am: 54e9262f99
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816880
Change-Id: Id0ad40613882a939162e4e13a8632ae1d8484117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 20:18:52 +00:00
Treehugger Robot
54e9262f99
Merge "Add PRODUCT_VALIDATION_CHECKS" into main
2023-11-06 19:39:19 +00:00
Roshan Pius
81d167424a
Revert "handheld_system: Replace NFC app with NFC apex"
...
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:51dc3e7a205652c99c6d022f6fabb8b31b11d29b )
Merged-In: Ic35189ae47f3e2b4302d09cbb524f7c8e6ddc2d6
Change-Id: Ic35189ae47f3e2b4302d09cbb524f7c8e6ddc2d6
2023-11-06 19:37:43 +00:00
Cole Faust
7aa649a62c
Add PRODUCT_VALIDATION_CHECKS
...
This is a new mechanism for asserting properties about your product
config. See the documentation in product_validation_checks.mk for
more information.
Test: Manually
Change-Id: I698dea899441f3773f839ea2ba1a2a6cfe59b57b
2023-11-06 10:42:01 -08:00
LaMont Jones
2504f9590e
Merge changes from topic "product-flags" into main am: 253bd067da
am: babf70fd87
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2815850
Change-Id: I3c0dc6cf128a7f06ca6c09d396ea579b88695bfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 15:06:08 +00:00
LaMont Jones
990593ae20
Merge changes from topic "product-flags" into main am: 253bd067da
am: cf86240285
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2815850
Change-Id: I04431f45c4321d15dbe162ae49c704fb514115e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 15:04:02 +00:00
LaMont Jones
441912b7f5
Reapply "Add support for product-specific build flags" am: df398d19d4
am: 37ef9eb1ea
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2815849
Change-Id: Ie7f1d07bc96614c5bf7c40a5f9a103319f6cb882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 15:03:58 +00:00
LaMont Jones
babf70fd87
Merge changes from topic "product-flags" into main am: 253bd067da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2815850
Change-Id: Ibe399ef6d26e67ccf1007654acf9d15583316cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 14:37:14 +00:00
LaMont Jones
cf86240285
Merge changes from topic "product-flags" into main am: 253bd067da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2815850
Change-Id: I34b9bd09f805bdc1b7e0c0dff61432eb6980c92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 14:33:34 +00:00
LaMont Jones
37ef9eb1ea
Reapply "Add support for product-specific build flags" am: df398d19d4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2815849
Change-Id: I5b01bfee6aac76c9f6ef320f4d4f444c7ac2a4b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 14:33:26 +00:00
LaMont Jones
253bd067da
Merge changes from topic "product-flags" into main
...
* changes:
Reapply "release_config: build flags can be lists"
Reapply "Add support for product-specific build flags"
2023-11-06 14:08:22 +00:00
Handa Wang
9709f04dc2
Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main am: 8f1f35461e
am: 69a637ed9b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2817055
Change-Id: Ia0baeacef1644fca69ab0132b764697a6ba7758f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 09:37:36 +00:00
Handa Wang
69a637ed9b
Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main am: 8f1f35461e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2817055
Change-Id: If3465c220ed3ffd4c64953671e8d1d4a9d946860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 09:07:35 +00:00
Handa Wang
ad96d3dd09
Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main am: 8f1f35461e
am: 0f5b04f64f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2817055
Change-Id: Ia6beccda745813e21b38fb96e2d9d7bf9cad4a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 09:03:41 +00:00
Handa Wang
0f5b04f64f
Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main am: 8f1f35461e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2817055
Change-Id: Ia8277636b9953f28b379246571a4102bb6cfcc91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 08:33:12 +00:00
Handa Wang
8f1f35461e
Merge "add ot-cli-ftd in /system/bin/ for eng and userdebug builds" into main
2023-11-06 08:18:55 +00:00
Kiyoung Kim
ae5e1b7bb0
Deprecate VNDK based on feature flag
...
A new feature flag RELEASE_DEPRECATE_VNDK is added to control VNDK
deprecation. Use this value to decide whether VNDK should be deprecated,
and keep it overridable with command for now.
Bug: 301346137
Test: Checked if aosp_cf_x86_64_phone-trunk_staging is VNDK deprecated
Change-Id: Ib9bb48fbfb14d1ab87f939439da4f23e364d1173
2023-11-06 07:30:57 +00:00
Justin Yun
c0f3d8ef5e
Merge "Set ro.product.vndk.version for VNDK v35" into main am: 2071b4eac2
am: 33f35cead6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2814675
Change-Id: I7ec4fc13854f793c4b5f62c4fe57404f5d12e060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-05 08:33:02 +00:00
Justin Yun
e1a5aee199
Merge "Set ro.product.vndk.version for VNDK v35" into main am: 2071b4eac2
am: 7094ed249f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2814675
Change-Id: I176dd16ce11e5a6df1d274818e2fa6f2ce31752c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-05 08:30:38 +00:00
Justin Yun
33f35cead6
Merge "Set ro.product.vndk.version for VNDK v35" into main am: 2071b4eac2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2814675
Change-Id: Ife0c6917e2f9a49b8edb525785724134dabaced7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-05 08:02:56 +00:00
Justin Yun
7094ed249f
Merge "Set ro.product.vndk.version for VNDK v35" into main am: 2071b4eac2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2814675
Change-Id: I12f97e2b16d285350618843e640bf5762eb6fdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-05 08:00:15 +00:00
Justin Yun
2071b4eac2
Merge "Set ro.product.vndk.version for VNDK v35" into main
2023-11-05 07:16:14 +00:00
Treehugger Robot
d27c232881
Merge "Retire emulator build files from build/make" into main am: e3dca814e3
am: 4ab268de12
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2816877
Change-Id: Ic06304b5107608c7883cc2395bd6fe12688802ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-03 19:20:43 +00:00