Commit Graph

90603 Commits

Author SHA1 Message Date
Treehugger Robot
ccdb708c39 Merge "Move signing related options to a shared place" into main am: 5003ff741a
Original change: https://android-review.googlesource.com/c/platform/build/+/2828703

Change-Id: I902dab8e6d9ebf90c3622e27a2d9db5da40cc833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 19:12:22 +00:00
Treehugger Robot
73d90a1025 Merge "Allow ParseOptions to compose multiple option parsers easily" into main am: f0e5c7e321
Original change: https://android-review.googlesource.com/c/platform/build/+/2828702

Change-Id: I797de4568b5aeb2c50f6865651dcdffec68b7ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 19:12:11 +00:00
Ted Bauer
d3a323b15b Merge "Revert "Cache Java codegen'd flags in static member variables."" into main am: a06cff1048
Original change: https://android-review.googlesource.com/c/platform/build/+/2832511

Change-Id: I959592522f2d2183638e036dae715ecc9d36970e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 19:10:42 +00:00
Treehugger Robot
5003ff741a Merge "Move signing related options to a shared place" into main 2023-11-15 18:32:40 +00:00
Treehugger Robot
f0e5c7e321 Merge "Allow ParseOptions to compose multiple option parsers easily" into main 2023-11-15 18:32:00 +00:00
Ted Bauer
a06cff1048 Merge "Revert "Cache Java codegen'd flags in static member variables."" into main 2023-11-15 18:04:10 +00:00
Aditya Choudhary
bb858bb6be Merge "Add metadata generator tool for test spec metadata generation. Bug: 296873595 Test: Manual test (use go test inside tools/metadata/testdata)" into main am: 4277d617f2
Original change: https://android-review.googlesource.com/c/platform/build/+/2815214

Change-Id: I23419ea04ee69275aad70e6e485d33dd7ff6c9b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:19:55 +00:00
Aditya Choudhary
4277d617f2 Merge "Add metadata generator tool for test spec metadata generation. Bug: 296873595 Test: Manual test (use go test inside tools/metadata/testdata)" into main 2023-11-15 17:13:28 +00:00
Jihoon Kang
07d41e2762 Merge "Set BUILD_FROM_SOURCE_STUB=true for finalization" into main am: 3b12b769e4
Original change: https://android-review.googlesource.com/c/platform/build/+/2830911

Change-Id: Ia1ec0e79e7aa858b445592721d5c719909fce9e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:03:46 +00:00
Ted Bauer
efda207c09 Revert "Cache Java codegen'd flags in static member variables."
This reverts commit afe55106e5.

Reason for revert: causes a bug b/311187402

Change-Id: Ic3f56fbb66a6412cd702cebd9e4247032f950324
2023-11-15 16:52:02 +00:00
Jihoon Kang
3b12b769e4 Merge "Set BUILD_FROM_SOURCE_STUB=true for finalization" into main 2023-11-15 16:29:12 +00:00
Aditya Choudhary
51f97c1963 Add metadata generator tool for test spec metadata generation.
Bug: 296873595
Test: Manual test (use go test inside tools/metadata/testdata)

Change-Id: I404b57224828149f26bcf4deadb662f513886231
2023-11-15 16:08:14 +00:00
Greg Kaiser
89f7e09c03 Merge "Reland: Require TARGET_RELEASE for builds" into main am: 2c8ece0b25
Original change: https://android-review.googlesource.com/c/platform/build/+/2824863

Change-Id: If92a7892878532c87fa3e3e6035cb65f37ebd242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 14:17:51 +00:00
Greg Kaiser
2c8ece0b25 Merge "Reland: Require TARGET_RELEASE for builds" into main 2023-11-15 13:42:18 +00:00
Treehugger Robot
f50faa405b Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main am: a463723f16
Original change: https://android-review.googlesource.com/c/platform/build/+/2829637

Change-Id: I356a5115acb40c3ffbb0268736de96cd351bee7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 12:10:50 +00:00
Treehugger Robot
a463723f16 Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main 2023-11-15 11:43:29 +00:00
Treehugger Robot
0c7dd1f269 Merge "Add .product suffix for the product variants" into main am: 251ad2f41f
Original change: https://android-review.googlesource.com/c/platform/build/+/2829418

Change-Id: I5e338a57785f6a84ed4269895bdeeeda0b454116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 08:35:39 +00:00
Harshit Mahajan
1b22a8e7dd Revert "[CrashRecovery] Add module to BCP and SSCP"
Revert submission 2789412-cherrypicker-L65800000963076834:N61100001405784943

Reason for revert: Leading to merge conflict
Bug: b/311082270

Reverted changes: /q/submissionid:2789412-cherrypicker-L65800000963076834:N61100001405784943

Change-Id: I2cbe26499ad5ce938db7cdd3ebaf9c2e48982de9
Merged-In: I39dfab62897d907023720b594d6929397403d314
2023-11-15 08:26:47 +00:00
Treehugger Robot
251ad2f41f Merge "Add .product suffix for the product variants" into main 2023-11-15 07:34:40 +00:00
Justin Yun
59fbdf0bba Add .product suffix for the product variants
Instead of adding .vendor suffix, add .product suffix to include
product variants.

Bug: 309511650
Test: atest com.android.gts.vndk.VndkDependencyTest#testVndkDependencyTestCase
Change-Id: I6d578be95c618c565347f0fdf660e82945ac77a3
2023-11-15 14:59:39 +09:00
Jihoon Kang
59c61acf64 Set BUILD_FROM_SOURCE_STUB=true for finalization
Build from text stub feature was initially implemented to improve build
performance and may be unstable for api finalization, as the stubs
generated from api signature files miss some methods, which may cause
backward compatibility issues. Therefore, this change disables building
from text stub for api finalization.

Test: build/tools/finalization/finalize-aidl-vndk-sdk-resources.sh and inspect generated ninja file to verify that the stubs are generated from source Java files.
Bug: 310279899
Change-Id: I9d374e973788bc97514815f64eeb949a94a97647
2023-11-15 00:38:41 +00:00
Kelvin Zhang
68252b801a Move signing related options to a shared place
Move OTA signing flags to payload_signer.py so that we can re-use these
flags in multiple binaries.

Test: th
Bug: 293313353
Change-Id: I44f9910cee37c449397e174a5784f747ec9fb0d6
2023-11-14 12:41:58 -08:00
Kelvin Zhang
c68c6b9530 Allow ParseOptions to compose multiple option parsers easily
There are certain options which we need to share in multiple binaries,
for example, the signer options. Current options parsing function only
accepts 1 extra option handler, which is inflexible. Extend it to take a
list of extra option handlers.

Currently, to add a new CLI flag, caller must append the flag name to
`extra_long_opts`, then pass an extra option handler which can handle
that option. Define a new dataclass which contains both the CLI flag
name and the code to handle that flag for better composition.

Test: th
Bug: 293313353
Change-Id: I758db66dfd95934f5b2701454d97bfe7d37dc16d
2023-11-14 12:41:56 -08:00
Alyssa Ketpreechasawat
9364c5e506 Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main am: c7bc53999d
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531

Change-Id: I594a68a6b0e12363378a62e7c59bae2a706f455d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 19:46:03 +00:00
Ted Bauer
04dfa3fdbb Merge "Cache Java codegen'd flags in static member variables." into main am: 99b189ac83
Original change: https://android-review.googlesource.com/c/platform/build/+/2827710

Change-Id: Ic4270c66a7baa9ba90869f5dc72b8d4b48bfdd54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 19:43:41 +00:00
Alyssa Ketpreechasawat
c7bc53999d Merge "Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled." into main 2023-11-14 19:13:32 +00:00
Ted Bauer
99b189ac83 Merge "Cache Java codegen'd flags in static member variables." into main 2023-11-14 19:04:05 +00:00
Ted Bauer
afe55106e5 Cache Java codegen'd flags in static member variables.
By caching flag values directly in member variables instead of caching
a HashMap and accessing that, flag reads avoid `hashCode()`, map
lookup, and Boolean.parse runtime costs. Flag reads are turning out
to have performance problems in hot paths, so this should help to
alleviate that.

Bug: 309625014
Test: m
Change-Id: I923bf6af2ae3fcbbf2fee7126b492a47cd6049ad
2023-11-14 12:02:01 -05:00
Justin Yun
0379fe98ee Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990

Change-Id: Ie2c6ea2b8897810ab5504b3d88cf775e358ec34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 00:07:02 +00:00
Justin Yun
136fa83d4e Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main 2023-11-13 23:40:06 +00:00
Treehugger Robot
beb58d4d99 Merge "Require scl files in ExecutionModeScl" into main am: 534b47bc8e
Original change: https://android-review.googlesource.com/c/platform/build/+/2828474

Change-Id: Ib2302e0f4eef346dc3ab3e0a4583de529d76fe7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 21:57:35 +00:00
Devin Moore
dd287881a1 Merge changes from topic "revert-2818339-remove_hidl_memory-VHKFNXVYFO" into main am: 731d920878
Original change: https://android-review.googlesource.com/c/platform/build/+/2828479

Change-Id: Ia10ed2635c29977c012eaab113ffd4e5b5095c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 21:56:14 +00:00
Treehugger Robot
534b47bc8e Merge "Require scl files in ExecutionModeScl" into main 2023-11-13 21:39:12 +00:00
Devin Moore
731d920878 Merge changes from topic "revert-2818339-remove_hidl_memory-VHKFNXVYFO" into main
* changes:
  Revert "Remove android.hidl.memory library from the VNDK"
  Revert "Stop including android.hidl.memory ashmem impl on V+ devices"
2023-11-13 21:30:03 +00:00
Zi Wang
b91670e00a Merge "Update test: true to mode: "test"" into main am: 2b09495e2a
Original change: https://android-review.googlesource.com/c/platform/build/+/2825611

Change-Id: Ic6439d47739e72cc7668f968922c2d119a6f93a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 20:15:14 +00:00
Cole Faust
6309234411 Require scl files in ExecutionModeScl
Also remove json from scl file builtins, as it's not in bazel.

Bug: 309686282
Test: Presubmits
Change-Id: I6227c5dc14922b4682380254b4716b4ae38c47b9
2023-11-13 11:47:30 -08:00
Devin Moore
0b69afa338 Revert "Remove android.hidl.memory library from the VNDK"
Revert submission 2818339-remove_hidl_memory

Reason for revert: b/310680652 broke VTS tests

Reverted changes: /q/submissionid:2818339-remove_hidl_memory

Change-Id: Ie55fd1d0b8429a17966755ec1c54b2868ca966f9
2023-11-13 19:32:46 +00:00
Devin Moore
77393ba39d Revert "Stop including android.hidl.memory ashmem impl on V+ devices"
Revert submission 2818339-remove_hidl_memory

Reason for revert: b/310680652 broke VTS tests

Reverted changes: /q/submissionid:2818339-remove_hidl_memory

Change-Id: I1065d67949c4270d5351a9ca00ec79ead845020d
2023-11-13 19:32:54 +00:00
Zi Wang
2b09495e2a Merge "Update test: true to mode: "test"" into main 2023-11-13 19:23:55 +00:00
Devin Moore
b29721f486 Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339

Change-Id: I2d9d0e146ab59d4a2fe96638e356825d234202ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 18:57:16 +00:00
Devin Moore
60684f109d Remove android.hidl.memory library from the VNDK am: 4859a6a250
Original change: https://android-review.googlesource.com/c/platform/build/+/2818338

Change-Id: Iefd51fa05c3110c616c4017157093045bdfe7f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 18:57:12 +00:00
Devin Moore
001ed67bba Merge changes from topic "remove_hidl_memory" into main
* changes:
  Stop including android.hidl.memory ashmem impl on V+ devices
  Remove android.hidl.memory library from the VNDK
2023-11-13 17:55:30 +00:00
Alyssa Ketpreechasawat
ba231d2084 Remove jars in PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY (e.g. framework-pdf in MP) from ApexBootJars when prebuilt is enabled.
framework-pdf is newly added framework jar which is not yet included in
the actual prebuilt apex. Thus, we add it PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY. The APEX_BOOT_JARS_EXCLUDED will be created based on PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY and will be removed from ApexBootJars.

Bug: 304719212
Test: lunch cf_x86_phone-next-userdebug & m
Test: lunch cf_x86_phone-trunk-userdebug & m
Change-Id: I9902131629900fbd629b8560a422ed8c2b06073c
2023-11-13 13:22:32 +00:00
Colin Cross
4bd43459ea Merge "Escape sbom lines" into main am: 70ed34cc72
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847

Change-Id: If4f0acc2ce978a83e6c2527080de24584dbc3b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 03:52:28 +00:00
Colin Cross
70ed34cc72 Merge "Escape sbom lines" into main 2023-11-11 03:22:11 +00:00
Colin Cross
92f8043874 Escape sbom lines
Go 1.21 changes the names of some factory functions to include
characters that need shell escaping.  Wrap everything written to
the sbom file with single quotes.

Bug: 309895579
Test: m out/target/product/vsoc_x86_64/sbom-metadata.csv
Change-Id: Ia61f02d8b02dd9f92ce144307087423c592a1833
2023-11-10 15:06:21 -08:00
Treehugger Robot
4f0489ae6e Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440

Change-Id: Idf689b6c79faddf383f905049c57aee5e548771a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:20:13 +00:00
Jiakai Zhang
b4eb76c827 Update dexopt system properties. am: 7707456104
Original change: https://android-review.googlesource.com/c/platform/build/+/2817439

Change-Id: I9388910df0ce36fe0a3e9de3d116c5a296c8b98b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 19:20:07 +00:00
Treehugger Robot
fc9ebd2684 Merge changes from topic "disable-dexpreopt-dexopt" into main
* changes:
  Add a Make variable to disable all dexpreopt and dexopt activities.
  Update dexopt system properties.
2023-11-10 18:47:19 +00:00
Treehugger Robot
2f58937935 Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2825192

Change-Id: Ia1096d264ee4cb2927d3cfc854078d7cb67da48d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 09:08:56 +00:00