Greg Kaiser
4afb07c3c8
Merge "Reland: Require TARGET_RELEASE for builds" into main am: 2c8ece0b25
am: 0f62caed3b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824863
Change-Id: Ia1d11540daab184afbb103c04d89b6895b8135be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 14:49:29 +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
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
a403e1a0e8
Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main am: a463723f16
am: f50faa405b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2829637
Change-Id: I1bff9b023b0a5fd1dcd79f440a4d7626e0cc289c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 12:41:44 +00:00
Treehugger Robot
51b9cfc15c
Merge "Revert "[CrashRecovery] Add module to BCP and SSCP"" into main am: a463723f16
am: 6ea8770753
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2829637
Change-Id: Ic750d3c7cfda60ad57dbaf95390ff80fc5ca6375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 12:39:43 +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
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
808d10aa26
Merge "Add .product suffix for the product variants" into main am: 251ad2f41f
am: 0c7dd1f269
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2829418
Change-Id: I9c2e8065e5db2a3a9fe789dad0a25eef04cb05ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:08:00 +00:00
Treehugger Robot
b3eeff3c2b
Merge "Add .product suffix for the product variants" into main am: 251ad2f41f
am: 602c9df271
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2829418
Change-Id: I751168efb5ea5a947c5035effacd1d891f1fc172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-15 09:05:51 +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
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
bc9aaf6ff4
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
am: 9364c5e506
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531
Change-Id: I0f576ab92d2633e3870d5a29a70e6cf2ad30b152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 20:10:51 +00:00
Ted Bauer
02fa94d26f
Merge "Cache Java codegen'd flags in static member variables." into main am: 99b189ac83
am: 04dfa3fdbb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2827710
Change-Id: Ibfdbafb759eddc16716deedce401b4e521b10a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 20:08:37 +00:00
Alyssa Ketpreechasawat
b02812d84c
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
am: 566f69178c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2822531
Change-Id: I004ff3a20eccd4ebc2a0105551f80e0571da1ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 20:07:39 +00:00
Ted Bauer
fe70d1aae1
Merge "Cache Java codegen'd flags in static member variables." into main am: 99b189ac83
am: c033f16d3a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2827710
Change-Id: I0df3d0b1dd2146589b6af8430ea515e2d7f2d814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 20:07:31 +00: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
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
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
896acfe6e0
Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e
am: 0379fe98ee
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990
Change-Id: Ia3344467baa39cfbec9b9779c11fb887def51791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 00:39:18 +00:00
Justin Yun
d7d7e5c61e
Merge "Define BOARD_API_LEVEL and BOARD_API_LEVEL_FROZEN" into main am: 136fa83d4e
am: df2645967d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825990
Change-Id: Iebeabebf8a98dd93e5c2d9380e1d81fbc47e4ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-14 00:37:31 +00: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
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
c651a00ead
Merge "Require scl files in ExecutionModeScl" into main am: 534b47bc8e
am: beb58d4d99
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2828474
Change-Id: Ib9a7283fdad6a7a4166a2d6279ce5734cad7d3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 22:28:59 +00:00
Devin Moore
4b6d302c2d
Merge changes from topic "revert-2818339-remove_hidl_memory-VHKFNXVYFO" into main am: 731d920878
am: dd287881a1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2828479
Change-Id: I9b9ba25f08dd944f7ad48e253cee9405232057fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 22:28:20 +00:00
Treehugger Robot
642b403196
Merge "Require scl files in ExecutionModeScl" into main am: 534b47bc8e
am: bfc36ad923
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2828474
Change-Id: I652a0fce6d0e2603a19b4aff7883daa93706513a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 22:27:10 +00:00
Devin Moore
59e44874c5
Merge changes from topic "revert-2818339-remove_hidl_memory-VHKFNXVYFO" into main am: 731d920878
am: a700ffcb1c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2828479
Change-Id: I6cb1c992d26c748e8a6ca6d4fd8a72431f79b6b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 22:26:44 +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
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
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
7c73e9ef3b
Merge "Update test: true to mode: "test"" into main am: 2b09495e2a
am: 559915d4a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825611
Change-Id: I67b6a5bec964dc0ac3a631d0403caa944feeaa64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 20:46:59 +00:00
Zi Wang
88b39357e2
Merge "Update test: true to mode: "test"" into main am: 2b09495e2a
am: b91670e00a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2825611
Change-Id: I6121de2aa92ccaa48880712feb12fa4d9e23179f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 20:18:21 +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
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
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