Commit Graph

92890 Commits

Author SHA1 Message Date
Anas Sulaiman
87c1aac646 Merge "fix RE for metalava actions" into main am: 3e17366053
Original change: https://android-review.googlesource.com/c/platform/build/+/2833312

Change-Id: If89db6ea7bbba7a33c59a994f14b432d54085ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 19:14:01 +00:00
Ted Bauer
ca355c09a2 Merge "Revert^2 "Cache Java codegen'd flags in static member variables."" into main 2023-11-16 18:48:00 +00:00
Anas Sulaiman
3e17366053 Merge "fix RE for metalava actions" into main 2023-11-16 18:42:24 +00:00
Ted Bauer
c3073786b3 Revert^2 "Cache Java codegen'd flags in static member variables."
This reverts commit efda207c09.

Reason for revert: this unrevert contains the fix for b/311187402

Test: cargo test
Change-Id: I210aebd30edd864a7c141ede336c12aebf4f1fcd
2023-11-16 12:26:41 -05:00
Kiyoung Kim
d53d1c7791 Merge "Deprecate VNDK based on feature flag" into main am: 25b71e0689
Original change: https://android-review.googlesource.com/c/platform/build/+/2803353

Change-Id: I7fc5f38c227ad4d45e6c7c76d818f75999186c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 01:10:49 +00:00
Kiyoung Kim
25b71e0689 Merge "Deprecate VNDK based on feature flag" into main 2023-11-16 00:37:29 +00:00
Aditya Choudhary
5424f6e2c5 Merge "Refactor metadata tool to support metadata generation for different rules." into main am: 432c41ecbf
Original change: https://android-review.googlesource.com/c/platform/build/+/2833290

Change-Id: Ic7cd050759a12ccda49dae0b868814d40fd24efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 22:43:25 +00:00
Aditya Choudhary
432c41ecbf Merge "Refactor metadata tool to support metadata generation for different rules." into main 2023-11-15 22:11:22 +00:00
Anas Sulaiman
5dacf0f6dd fix RE for metalava actions
Some of those actions use unzip which is not available in the source
tree and needs to be installed in the container.

Bug: b/309783005
Test: Ran an android build and verified there are no local fallbacks from metalava actions.
Change-Id: I360c3fb30e2eacc0615ed636115bce011bff5bf3
2023-11-15 20:39:45 +00:00
Treehugger Robot
722f9e796a 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: I3fd7a8fae19e601886b2cb4f55adbcfd027c956d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 19:12:14 +00:00
Treehugger Robot
ed642d01e2 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: I761ceb28e2990de48c86e8e63c6d11990fe3658c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 19:12:04 +00:00
Ted Bauer
cc8f4decc7 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: I3e5209027862d8eece25ac368e9e5284c0e74ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 19:10:39 +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
Aditya Choudhary
a96ce3223a Refactor metadata tool to support metadata generation for different rules.
Bug: 296873595
Test: Manual test (use go test inside tools/metadata/testdata)

Change-Id: I881fd76213ec78001f9e12ed2fbc860d1503a364
2023-11-15 18:05:11 +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
56e448a796 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: I8d45a48d847fb8d36238e411e04e2d4ec9ebe913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:34:37 +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
36f8125650 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: I374c3d2d984cba53e2d5f81abff681ebd1fc7bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:03:56 +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
0f62caed3b Merge "Reland: Require TARGET_RELEASE for builds" into main am: 2c8ece0b25
Original change: https://android-review.googlesource.com/c/platform/build/+/2824863

Change-Id: I905bd794ad0c5de8967a029ef7cdbb8dc779817b
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
6ea8770753 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: If726500da1b4e6235a0dc54bc10d3d8d41ee70bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 12:10:42 +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
602c9df271 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: I9a8ec444e9fdc19e3426d5f163ec61b765306868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 08:35:10 +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
566f69178c 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: I28dde980714a4eb4571f605c6e217f5750e8f6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 19:44:58 +00:00
Ted Bauer
c033f16d3a 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: I45c1c859a72fd5c427c5ac34608ef85acbd2e744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 19:44:08 +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
Colin Cross
93e1e702a4 Remove ALL_DEPS.MODULES
Nothing reads it any more.

Test: m checkbuild
Change-Id: I6f11a5273b0c2cc92a3b0c49bbefbf084cb734a1
2023-11-14 11:03:08 -08: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
Florian Mayer
beb5bed41f Increase scudo MTE buffer for fullmte devices
Bug: 309446692
Change-Id: Idfb7956a1f7031d908f026d120fe8e253976ff4f
2023-11-14 02:51:14 -08:00
Sundong Ahn
1930fd1f67 Add --boot-image-dir-path arg
The --boot-image-dir-path arg is added to use the boot.img in Android
Common Kernel (ACK) when merging.

Test: merge_target_files.py with --boot-image-dir-path and without
--boot-image-dir-path
Bug: 309745179

Change-Id: Ia164a9fc7e4761ad7efb871c0b6054195e9e4bda
2023-11-14 13:11:59 +09:00
Justin Yun
df2645967d 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: I83bb0eaa6e9cb8bb87c46ac1977d1200675f5579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 00:07:25 +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
Devin Moore
49d8ce39e6 Reapply "Stop including android.hidl.memory ashmem impl on V+ devices"
This reverts commit 77393ba39d.

Test: m && launch_cvd && adb shell ls /vendor/lib64/hw
Bug: 205764958
Bug: 310700278
Bug: 310680652
Change-Id: Ie631c666b42fbb4dc30ffd141dc8a7dbb62b2a51
2023-11-13 22:40:46 +00:00
Devin Moore
8a68859bef Reapply "Remove android.hidl.memory library from the VNDK"
This reverts commit 0b69afa338.

Test: m
Bug: 205764958
Bug: 310700278
Bug: 310680652
Change-Id: I3cbae50922fcc230f402f68732faf50ed5683f25
2023-11-13 22:40:43 +00:00
Treehugger Robot
bfc36ad923 Merge "Require scl files in ExecutionModeScl" into main am: 534b47bc8e
Original change: https://android-review.googlesource.com/c/platform/build/+/2828474

Change-Id: Ibd74fdede0f6003e0c4841934ed77bd3aabab409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 21:57:14 +00:00
Devin Moore
a700ffcb1c 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: I08444cce4388ab0f9b59fd23d576fb61bfe811f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 21:56:40 +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
559915d4a9 Merge "Update test: true to mode: "test"" into main am: 2b09495e2a
Original change: https://android-review.googlesource.com/c/platform/build/+/2825611

Change-Id: I2beb33b39dbe04926659153411cd20a42a09ab96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 20:15:07 +00:00