Commit Graph

36880 Commits

Author SHA1 Message Date
Inseob Kim
d8cde77607 Add support for auto-generated characteristics RRO
Setting use_rro_for_product will automatically generate an RRO package
which contains resources with 'product="{PRODUCT_CHARACTERISTICS}"'. The
RRO package will be installed to /product partition. The app will be
compiled with '--product default', making the app identical to all
targets.

Motivation for this change is to minimize divergence of system.img.

Bug: 294799593
Test: boot and idmap2 dump
Change-Id: I549c2589c69eab7a1568510a7d1ff0c8a003f7ea
2023-11-07 14:06:14 +09:00
Colin Cross
25fbdafe0e Merge "Revert "Reapply "Add support for product-specific build flags""" into main am: 5f24ce6158 am: f78b8051d4 am: aeb9e638de
Original change: https://android-review.googlesource.com/c/platform/build/+/2818085

Change-Id: I167dd9955067ed2c5cf335e81ece406b8c0c2edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 23:58:13 +00:00
Colin Cross
67eb9c726c Merge "Revert "Reapply "release_config: build flags can be lists""" into main am: cc318d33e1 am: 9717c3fe3c am: a914569a9d
Original change: https://android-review.googlesource.com/c/platform/build/+/2818084

Change-Id: I330b64fb56465d4c2061e9f1770d3fc77b9f2f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 23:58:08 +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
Treehugger Robot
e48d668a5b Merge "Export build flags to soong." into main am: 1acc860f83 am: 6ff3372545 am: c0cb8edeca
Original change: https://android-review.googlesource.com/c/platform/build/+/2795632

Change-Id: I77950ee6718fb728ec9f6c6a2c8d357165c479d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 22:51:13 +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
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
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
2e8a419199 Merge "Add PRODUCT_VALIDATION_CHECKS" into main am: 54e9262f99 am: 6365c31102 am: c72c19927d
Original change: https://android-review.googlesource.com/c/platform/build/+/2816880

Change-Id: I45492b29684f0aca84e26e66f81b79be15fec8a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 21:33:44 +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
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
Jeff Sharkey
ef8c106ca3 Merge "Add ravenwood test config template" into main 2023-11-06 18:47:28 +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
31f324c138 Merge changes from topic "product-flags" into main am: 253bd067da am: cf86240285 am: 990593ae20
Original change: https://android-review.googlesource.com/c/platform/build/+/2815850

Change-Id: I7387704d6afe0e5978c955dfca15ff4b8c5e9000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 15:46:47 +00:00
LaMont Jones
97a07b1b69 Reapply "Add support for product-specific build flags" am: df398d19d4 am: 37ef9eb1ea am: 441912b7f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2815849

Change-Id: I527b3b742fee1dadb885826afd715c5586ab03c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 15:46:44 +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
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
7d95250297 Merge "Set ro.product.vndk.version for VNDK v35" into main am: 2071b4eac2 am: 7094ed249f am: e1a5aee199
Original change: https://android-review.googlesource.com/c/platform/build/+/2814675

Change-Id: I22611986a3f70f076d32f2eb167190bc9d1ca954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-05 09:12: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
Colin Cross
b874694de5 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32 am: 6281ca70d0 am: 4354a51b61
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: Ief41c26347b063163bf45d3cd0a39468fdb0f650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 17:01:05 +00:00
Colin Cross
4354a51b61 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32 am: 6281ca70d0
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: Ib37f1ad0121a47320e03faf41e9cfb24f6d00ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 16:19:01 +00:00
Colin Cross
0aa2a34d26 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: If17d717883160e90a0aae19dbf2b6a8b12afcb0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 15:51:52 +00:00
Colin Cross
6281ca70d0 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: Idb5090bac0f699ab0661d903b03a929d57ec0e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 15:49:27 +00:00
Colin Cross
b5ec156b32 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main
* changes:
  Remove code related to unused LOCAL_* variables
  Delete unused variables from clear_vars.mk
  Remove obsolete ide.mk and related code
  Removed unused license code
  Remove obsolete uses of LOCAL_MODULE_TAGS
2023-11-03 15:27:34 +00:00
Colin Cross
00d65a01a5 Skip parts of notice_files.mk that don't apply to Soong modules
Move the parts of notice_files.mk that set variables that are only
used for Make modules inside the conditional on
LOCAL_SOONG_LICENSE_METADATA.

Bug: 309006256
Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I5dc5a4ed223c6c2cb13460f59d0e7a03d4c9d097
2023-11-02 19:48:46 -07:00
Wei Li
26bcd6102e Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main am: 581b781ac4 am: 60d2436635 am: cee308e4f4
Original change: https://android-review.googlesource.com/c/platform/build/+/2809912

Change-Id: Iff2c1d303cd72793387db1ef9c4ec4dd684dfd44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 23:57:19 +00:00
Wei Li
cee308e4f4 Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main am: 581b781ac4 am: 60d2436635
Original change: https://android-review.googlesource.com/c/platform/build/+/2809912

Change-Id: Ia444aa5339e9b51170462c0218100cf177342064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 23:17:26 +00:00
Wei Li
26452946c5 Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main am: 581b781ac4
Original change: https://android-review.googlesource.com/c/platform/build/+/2809912

Change-Id: Ib0f3825681ddff24501c0f0d3d998b5d691e9cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:51:56 +00:00
Wei Li
60d2436635 Merge "Include following files in the SBOM of layoutlib, which are disted in Soong." into main am: 581b781ac4
Original change: https://android-review.googlesource.com/c/platform/build/+/2809912

Change-Id: I28c66a4dc0364bcb763591a90aae2f384f46c307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:49:52 +00:00