Commit Graph

92736 Commits

Author SHA1 Message Date
Ted Bauer
8524c8fe24 Merge "Revert^2 "Cache Java codegen'd flags in static member variables."" into main am: ca355c09a2 am: c0e30a22e6
Original change: https://android-review.googlesource.com/c/platform/build/+/2833310

Change-Id: Ic735c83a09c5a61705fc87bb25475e4000dc329e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 19:47:41 +00:00
Anas Sulaiman
0d5085bb37 Merge "fix RE for metalava actions" into main am: 3e17366053 am: 87c1aac646
Original change: https://android-review.googlesource.com/c/platform/build/+/2833312

Change-Id: I9e3a4cb6e1c2a4e6becbabaf40d060bb77284d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 19:47:21 +00:00
Ted Bauer
c0e30a22e6 Merge "Revert^2 "Cache Java codegen'd flags in static member variables."" into main am: ca355c09a2
Original change: https://android-review.googlesource.com/c/platform/build/+/2833310

Change-Id: Ibf6ca47d71f4dce8eb84e0b17028bb516b5061c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 19:14:34 +00:00
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
Ankur Bakshi
4adbbb7a6b [automerger skipped] RESTRICT AUTOMERGE Update Security String to 2024-01-05 am: f209c43eb2 -s ours
am skip reason: Merged-In I9edc7171d124f0cfa540fea6f0e06ba877910444 with SHA-1 2666d4443b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/25293138

Change-Id: I79812fb344fe33eeacb377fd7c562036cb49620a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 08:19:33 +00:00
Ankur Bakshi
f209c43eb2 RESTRICT AUTOMERGE Update Security String to 2024-01-05
Bug: 309529736

Change-Id: I4fd1cbb419bb5d84ebe33779823061695b10c89d
Ignore-AOSP-First: Internal first as its needed for preparing the release
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
2023-11-16 06:41:19 +00:00
Kiyoung Kim
33029ca803 Merge "Deprecate VNDK based on feature flag" into main am: 25b71e0689 am: b17f5181ee
Original change: https://android-review.googlesource.com/c/platform/build/+/2803353

Change-Id: I2234c9afb40e290cd135c2602d3ba7c8e1efb6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 01:45:27 +00:00
Kiyoung Kim
91866fe2e8 Merge "Deprecate VNDK based on feature flag" into main am: 25b71e0689 am: d53d1c7791
Original change: https://android-review.googlesource.com/c/platform/build/+/2803353

Change-Id: I0b1d8c5e0bec3f6af4748ee9dcce5c427a89cd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 01:43:36 +00:00
Kiyoung Kim
b17f5181ee Merge "Deprecate VNDK based on feature flag" into main am: 25b71e0689
Original change: https://android-review.googlesource.com/c/platform/build/+/2803353

Change-Id: I5e8ea64aee01bc9cfac00dc3709ad2bb8b69e52f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 01:12:24 +00: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
9440806c65 Merge "Refactor metadata tool to support metadata generation for different rules." into main am: 432c41ecbf am: a41042a2c9
Original change: https://android-review.googlesource.com/c/platform/build/+/2833290

Change-Id: I4ea6385ba4bd5946766116d166b3eb139bae53fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 23:17:05 +00:00
Aditya Choudhary
f2a9d4694d Merge "Refactor metadata tool to support metadata generation for different rules." into main am: 432c41ecbf am: 5424f6e2c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2833290

Change-Id: Ie7f2c07c18b2037a31a8995e84045b19a39c6c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 23:15:59 +00:00
Aditya Choudhary
a41042a2c9 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: I711bb6ca26d52cc96f3f1cecf1eed5cbe9e6b36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 22:43:28 +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
71b35f07ce Merge "Move signing related options to a shared place" into main am: 5003ff741a am: ccdb708c39
Original change: https://android-review.googlesource.com/c/platform/build/+/2828703

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

Change-Id: Ibf48b5adefdb3d76c23323d97fbd2fe805664930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 19:43:34 +00:00
Treehugger Robot
0dea5c2934 Merge "Move signing related options to a shared place" into main am: 5003ff741a am: 722f9e796a
Original change: https://android-review.googlesource.com/c/platform/build/+/2828703

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

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

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

Change-Id: Ibad3ccb16e6aef10e948ceb02af156aa17bf43e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 19:39:59 +00:00
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
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
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
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
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
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
a2c177743c 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: bb858bb6be
Original change: https://android-review.googlesource.com/c/platform/build/+/2815214

Change-Id: I6a98fcc531609379c1c009b5d6579d71492085fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:37:16 +00:00
Jihoon Kang
f5f308651c Merge "Set BUILD_FROM_SOURCE_STUB=true for finalization" into main am: 3b12b769e4 am: 07d41e2762
Original change: https://android-review.googlesource.com/c/platform/build/+/2830911

Change-Id: I3c589c52e6580ca006e3310385ebbd00a3b1eef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:37:01 +00:00
Aditya Choudhary
b34721334b 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
Original change: https://android-review.googlesource.com/c/platform/build/+/2815214

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

Change-Id: Ia65d063bf83121d5bc0118574e4d358c531cfb94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 17:35:07 +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
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
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
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
6f058ed89e Merge "Reland: Require TARGET_RELEASE for builds" into main am: 2c8ece0b25 am: 89f7e09c03
Original change: https://android-review.googlesource.com/c/platform/build/+/2824863

Change-Id: Iff2255fc6603194c6775ace0051ee29445de098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 14:51:18 +00:00