Commit Graph

9037 Commits

Author SHA1 Message Date
Inseob Kim
5a16f787cb Merge "Add support for auto-generated characteristics RRO" into main am: 8fc7cf6301 am: 5b17e679f6 am: 8e2d89c7d7
Original change: https://android-review.googlesource.com/c/platform/build/+/2818463

Change-Id: I52936a4c4de35843b758fdf9166cdf7fa1a774c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 06:47:44 +00:00
Inseob Kim
8fc7cf6301 Merge "Add support for auto-generated characteristics RRO" into main 2023-11-17 05:02:28 +00:00
Ted Bauer
e02d57f911 Merge "Revert^2 "Cache Java codegen'd flags in static member variables."" into main am: ca355c09a2 am: c0e30a22e6 am: 8524c8fe24
Original change: https://android-review.googlesource.com/c/platform/build/+/2833310

Change-Id: I2297b3d7450b6477a979d19460a1e88535bfb244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 20:41:41 +00:00
Aditya Choudhary
70fb37ec11 Handle empty input file case in Metadata generation
Bug: 296873595
Test: Manual test (use go test inside tools/metadata/testdata)

Change-Id: Ib48e88bdad4c870be3ca955abfd64ee8dd74f85d
2023-11-16 20:09:25 +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
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
Aditya Choudhary
072ce433f2 Merge "Refactor metadata tool to support metadata generation for different rules." into main am: 432c41ecbf am: 5424f6e2c5 am: f2a9d4694d
Original change: https://android-review.googlesource.com/c/platform/build/+/2833290

Change-Id: Ia7752b6cf6266370449c0d25fe7a9a8790e93ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 23:48:24 +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
Treehugger Robot
2acbdcca8c Merge "Move signing related options to a shared place" into main am: 5003ff741a am: 722f9e796a am: 0dea5c2934
Original change: https://android-review.googlesource.com/c/platform/build/+/2828703

Change-Id: If9dbdae5ce4ed2a8c75a88e8823fc47e1c37c0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 20:35:28 +00:00
Automerger Merge Worker
f1b2ff0ac0 Merge "Merge "Allow ParseOptions to compose multiple option parsers easily" into main am: f0e5c7e321 am: ed642d01e2" into udc-qpr-dev-plus-aosp am: 87b06e5aec
Original change: https://android-review.googlesource.com/c/platform/build/+/2828702

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

Change-Id: I69eb92bf3fbe79049edc67bc0bbae62f03ed9ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 20:30:49 +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
ee5108762f 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 am: 56e448a796 am: b34721334b
Original change: https://android-review.googlesource.com/c/platform/build/+/2815214

Change-Id: Ia7de76311c204be0f6b8a65f4a80f0db7efee02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 18:31:19 +00:00
Jihoon Kang
2aa62be7ae Merge "Set BUILD_FROM_SOURCE_STUB=true for finalization" into main am: 3b12b769e4 am: 36f8125650 am: 09618c6ef6
Original change: https://android-review.googlesource.com/c/platform/build/+/2830911

Change-Id: I59f91a848e72fbb054adcbad20ccbad7446554f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 18:30:43 +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
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
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
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
Ted Bauer
34c9aa9492 Merge "Cache Java codegen'd flags in static member variables." into main am: 99b189ac83 am: c033f16d3a am: fe70d1aae1
Original change: https://android-review.googlesource.com/c/platform/build/+/2827710

Change-Id: I70e8303ab55e5fbcb2b1063087af14a91aae0608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 20:42:43 +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
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
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
6dc5924d72 Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e am: df2645967d am: d7d7e5c61e
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990

Change-Id: Ifcd1e9f0cd26c72f57652e9eed424ec92e7977f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 01:09:39 +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
4af4313fe9 Merge "Require scl files in ExecutionModeScl" into main am: 534b47bc8e am: bfc36ad923 am: 642b403196
Original change: https://android-review.googlesource.com/c/platform/build/+/2828474

Change-Id: Ic6b7225776d5e9294f09516f9a56a40f17687147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 23:01:11 +00:00
Treehugger Robot
534b47bc8e Merge "Require scl files in ExecutionModeScl" into main 2023-11-13 21:39:12 +00:00
Zi Wang
1dead8f1c0 Merge "Update test: true to mode: "test"" into main am: 2b09495e2a am: b91670e00a am: 88b39357e2
Original change: https://android-review.googlesource.com/c/platform/build/+/2825611

Change-Id: I105146d52edfa097ff6a7cee0a4eb91dd6d485e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 20:23:57 +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
Zi Wang
2b09495e2a Merge "Update test: true to mode: "test"" into main 2023-11-13 19:23:55 +00:00
Justin Yun
23d52435f3 Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN
BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN are set by the release
flags.
BOARD_API_LEVEL sets ro.board.api_level that shows the API level of
the vendor API surface.
BOARD_API_LEVEL_FROZEN sets ro.board.api_frozen that shows if the
ro.board.api_level is finalized.

Bug: 295269182
Test: getprop ro.board.api_level
Change-Id: Ie57c57b6c9f1fc0c98968195843059a48da8e512
2023-11-10 16:31:04 +09:00
Treehugger Robot
3f4786e890 Merge "Prevent using symlinks to starlark files" into main am: 124101862b am: 5ddf4a3006 am: f027dee3fc
Original change: https://android-review.googlesource.com/c/platform/build/+/2824818

Change-Id: I664272f2669b0902b4e47c1d83ff655618b2ff72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-10 02:08:43 +00:00
Zi Wang
0ab8a96dcf Update test: true to mode: "test"
Test: CI

Bug: 309990433
Change-Id: I31644510002560fd81c41fbe37f0872fc1135390
2023-11-09 16:33:39 -08:00
Treehugger Robot
124101862b Merge "Prevent using symlinks to starlark files" into main 2023-11-10 00:00:41 +00:00
Cole Faust
ccd26808af Prevent using symlinks to starlark files
Symlinks are frequently confusing / a source of bugs. They also don't
provide much utility over just loading the other file and re-exporting
its symbols, so recommend doing that instead.

Test: Presubmits
Change-Id: Ie3052ebc0add77f1746d6321fbdf7bc15df9819b
2023-11-09 14:32:55 -08:00
Treehugger Robot
7758fa78b9 Merge "Finalization for Trunk Stable, REL." into main 2023-11-09 22:04:48 +00:00
Dennis Shen
1fddfa7803 Merge changes from topic "rust_caching" into main am: 05585a9fa3 am: e9ca2c03bf am: 56800bfb5f
Original change: https://android-review.googlesource.com/c/platform/build/+/2822932

Change-Id: Ifab99c9f23fb6cf92cb0a7a1eb24bf637130abef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 21:32:44 +00:00
Dennis Shen
05585a9fa3 Merge changes from topic "rust_caching" into main
* changes:
  aconfig: Cache flag values for rust codegen
  aconfig: Cache flag values for c/c++ codegen
2023-11-09 20:03:42 +00:00
Dennis Shen
737b8e30a1 aconfig: Cache flag values for rust codegen
Bug: b/307336730
Test: atest aconfig.test
Change-Id: I01741a4205cbe4e9b007f43b043505bcbcf05cd8
2023-11-09 15:15:54 +00:00
Alex Buynytskyy
3fa5db0c08 Finalization for Trunk Stable, REL.
Ignore-AOSP-First: local first
Bug: 304316873
Test: build/make/tools/finalization/build-step-1-and-2.sh
Change-Id: I6d5c6d58cad755f44766a77583dfbbd7d612fed4
2023-11-09 05:02:11 +00:00
Treehugger Robot
7282bcc994 Merge "Finalization for TS: VNDK cleanup." into main 2023-11-09 03:53:06 +00:00
Abhishek Nigam
12da2db538 Merge changes from topic "nonabrevert" into main am: 80b1a3fc38 am: 373a50a218 am: 2d71e80757
Original change: https://android-review.googlesource.com/c/platform/build/+/2820713

Change-Id: Ic9bb89d46b035dfefe38663f2be781b18ba0e331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09 02:42:43 +00:00
Alex Buynytskyy
b1f263c5f8 Finalization for TS: VNDK cleanup.
- explicitly specify release config for internal builds (trunk),
- remove unnecessary VNDK steps.

Ignore-AOSP-First: local first
Bug: 304316873
Test: build/make/tools/finalization/build-step-1.sh
Change-Id: I709f09b6ca9ce3c30541ab88815761d8688b538c
2023-11-09 01:13:34 +00:00
Abhishek Nigam
1dfca46094 Revert "Move more non-AB code to separate files"
This reverts commit 513b86e5c2.

Change-Id: I6aae60642772a052404eb1773966b2e637864bbc
2023-11-08 22:29:18 +00:00
Abhishek Nigam
b148ac22f8 Revert "Fix non-AB ota generation failure"
This reverts commit 782b752889.

bug: 308932171
tested: locally generated and applied ota on nonab device
Change-Id: I67b26be01d6240b2cb332e13bc7c7959de128755
2023-11-08 22:29:18 +00:00
Dennis Shen
96506f4349 aconfig: Cache flag values for c/c++ codegen
Bug: b/307336730
Test: atest aconfig.test
Change-Id: Id604cf154d09a48f657277af6d799f0e17bc4e93
2023-11-08 19:19:35 +00:00