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
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
Devin Moore
a764ffffdd
Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba am: b29721f486
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339
Change-Id: I555017d4816005363581394de92a71f4618b07ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 19:31:25 +00:00
Devin Moore
3c2da0df99
Remove android.hidl.memory library from the VNDK am: 4859a6a250 am: 60684f109d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818338
Change-Id: I2333499a8c436b3b70771df7f72365db6af6fd29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 19:31:21 +00:00
Devin Moore
9cb1b74911
Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba am: 7622538d1c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339
Change-Id: Ieed4ae9fda8890cf1a828e61ef88c43fbde57f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 19:29:08 +00:00
Zi Wang
2b09495e2a
Merge "Update test: true to mode: "test"" into main
2023-11-13 19:23:55 +00:00
Devin Moore
7622538d1c
Merge changes from topic "remove_hidl_memory" into main am: 001ed67bba
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2818339
Change-Id: Id79bd6d0bdba7006fee6f1b261155f264c13d812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-13 19:02:56 +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
68de89c4eb
Merge "Escape sbom lines" into main am: 70ed34cc72 am: 4bd43459ea
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847
Change-Id: Icc4bec7d1e8d1fbad26fbd644849f57b080774f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-11 04:41:52 +00:00
Colin Cross
8736c21a1f
Merge "Escape sbom lines" into main am: 70ed34cc72 am: 7523abc4e1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847
Change-Id: I69e63159ffb7c4ccc9e6db874108140c95a19a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-11 04:40:00 +00:00
Colin Cross
7523abc4e1
Merge "Escape sbom lines" into main am: 70ed34cc72
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2824847
Change-Id: I752a0a0e5ac53dd24a797259529aa66d72c13e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-11 03:52:29 +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
ab54b8cbb0
Merge changes from topic "disable-dexpreopt-dexopt" into main am: fc9ebd2684 am: 4f0489ae6e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2817440
Change-Id: I168f0fe51a24588622bc346e4853b015ef3c6d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-10 19:54:15 +00:00
Jiakai Zhang
4a89c919d4
Update dexopt system properties. am: 7707456104 am: b4eb76c827
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2817439
Change-Id: Ie8f874e1363688ea545ff546eac4a32a57a7057d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-10 19:54:11 +00:00