Commit Graph

33811 Commits

Author SHA1 Message Date
Treehugger Robot
d1b9531f3a Merge "Rename otatools dependency from futility to futility-host" am: 272d090d39 am: 287c48cda6
Original change: https://android-review.googlesource.com/c/platform/build/+/2264495

Change-Id: I4721c6f4283699012f5785d85305f7152b8cc0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 08:53:33 +00:00
Treehugger Robot
287c48cda6 Merge "Rename otatools dependency from futility to futility-host" am: 272d090d39
Original change: https://android-review.googlesource.com/c/platform/build/+/2264495

Change-Id: I9f9a37e11c1c3c889ec1b295cabceb8de4102d9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 08:12:44 +00:00
Treehugger Robot
272d090d39 Merge "Rename otatools dependency from futility to futility-host" 2023-02-16 07:39:05 +00:00
Zhenhuang Wang
85343655f8 Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" am: 371da61096 am: 963bc9676e am: 55ed878a74
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552

Change-Id: I4c2fc30d1f7dab60557df0a7541ad555d3e212ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 04:55:43 +00:00
Zhenhuang Wang
55ed878a74 Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" am: 371da61096 am: 963bc9676e
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552

Change-Id: If0e839be1b406f6d8f253a9f87c8be0fad86eeff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 03:58:45 +00:00
Zhenhuang Wang
963bc9676e Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" am: 371da61096
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552

Change-Id: I8c9201b19e39bfa3455c1fd231d21cdfa174f5a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 03:10:39 +00:00
Zhenhuang Wang
371da61096 Merge "Revert "Revert "Enable -sha256 feature to some Soong built zip files""" 2023-02-16 02:10:40 +00:00
Aaron Kling
e380321735 Rename otatools dependency from futility to futility-host
The futility target for host is futility-host. This is required for
ryu out of tree signing.

Change-Id: I6c06ec69f991abc23597e19dd4478774cc4d56c4
2023-02-15 21:12:23 +00:00
Spandan Das
5f8e2b94e9 Merge "Dist api_fingerprint file for droidcore" am: d3e1b41c33 am: 3c48d0938d am: 48b2aa9d87
Original change: https://android-review.googlesource.com/c/platform/build/+/2435767

Change-Id: I8aec4a6465d716ea277f4293e2f680d6822b37d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 20:40:40 +00:00
Kelvin Zhang
7a76cc5d56 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" am: 8ffc90d4e9 am: f0a1afdd56 am: 1edd6337e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2435770

Change-Id: Ib66f1671fa16902f712ea3bcb5ee9492fa7615f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 20:35:39 +00:00
Xin Li
27b4d0c71f Merge "Merge TQ2A.230305.008" into stage-aosp-master 2023-02-15 19:45:53 +00:00
Spandan Das
48b2aa9d87 Merge "Dist api_fingerprint file for droidcore" am: d3e1b41c33 am: 3c48d0938d
Original change: https://android-review.googlesource.com/c/platform/build/+/2435767

Change-Id: I5b8cabb5459b2850482bf1709882d9f71c7adb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 19:31:35 +00:00
Kelvin Zhang
1edd6337e8 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" am: 8ffc90d4e9 am: f0a1afdd56
Original change: https://android-review.googlesource.com/c/platform/build/+/2435770

Change-Id: I46c4b5d95373e6d3b4cf6e3121d80c3643fb1e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 19:29:36 +00:00
Spandan Das
3c48d0938d Merge "Dist api_fingerprint file for droidcore" am: d3e1b41c33
Original change: https://android-review.googlesource.com/c/platform/build/+/2435767

Change-Id: Iaa2c36fc11d69793ec0a7a455191a3846ec400e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 18:48:55 +00:00
Kelvin Zhang
f0a1afdd56 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" am: 8ffc90d4e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2435770

Change-Id: Ia538767800ec15b648b21ea84c215b28ccfa8ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 18:47:30 +00:00
Spandan Das
d3e1b41c33 Merge "Dist api_fingerprint file for droidcore" 2023-02-15 18:06:27 +00:00
Kelvin Zhang
8ffc90d4e9 Merge "Copy all files from BOARD_SYSTEM_DLKM_SRC" 2023-02-15 18:03:02 +00:00
Kelvin Zhang
19961b53c4 Copy all files from BOARD_SYSTEM_DLKM_SRC
BOARD_SYSTEM_DLKM_SRC might contain files such as modules.dep. These
files also need to be copied, so relax the globbing pattern to copy all
files under BOARD_SYSTEM_DLKM_SRC.

Test: th
Bug: 267014648
Change-Id: I1fef8f8d7fe01fd4bd99d62981c108d95ef47bfe
2023-02-14 18:23:28 -08:00
Yike Zhang
a770a5d450 Merge "Export test config info to module-info while the module is uninstallable" am: 249865de52 am: af6394b6e7 am: 403f4cacd5
Original change: https://android-review.googlesource.com/c/platform/build/+/2434932

Change-Id: Ibdb9f70d219dc931de1c0a5eacbcd0af3a5d8d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 01:32:03 +00:00
Yike Zhang
403f4cacd5 Merge "Export test config info to module-info while the module is uninstallable" am: 249865de52 am: af6394b6e7
Original change: https://android-review.googlesource.com/c/platform/build/+/2434932

Change-Id: I79408936735c753029043b45b5afb8617e21abf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 00:30:15 +00:00
Xin Li
95bbef8402 Merge TQ2A.230305.008
Bug: 264720040
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Change-Id: I0cf59fc2635e8d951da0bbeced842f92c3d5b655
2023-02-14 16:13:00 -08:00
Yike Zhang
af6394b6e7 Merge "Export test config info to module-info while the module is uninstallable" am: 249865de52
Original change: https://android-review.googlesource.com/c/platform/build/+/2434932

Change-Id: I40a388305ce29b73c2fe8de71ba6d119554398ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 23:48:45 +00:00
Spandan Das
10cd857c3f Dist api_fingerprint file for droidcore
Currently it only gets disted for `sdk`

Bug: 266791853
Test: m dist droidcore, and checked out/dist/api_fingerprint.txt
Change-Id: I098c3890d7290a5f0094fea056cbc8bf1684df11
2023-02-14 21:26:55 +00:00
Yike
40f5c3a1fe Export test config info to module-info while the module is uninstallable
All Robolectric tests are set as uninstallable modules, which skips the
logic exporting `test_config` and `auto_test_config` to module-info.
But downstream infra needs this information to determine if a module is
a test module. So that this change moves the logic that sets
`test_config` and `auto_test_config` for Robolectric tests out of the
snippet specifically for installable module.

Test: m out/target/product/coral/module-info.json
Bug: 268670243
Change-Id: Icf4caf3d6833f3a39927fb69c6fb76762b8f6f14
2023-02-15 03:18:28 +08:00
Android Build Coastguard Worker
1c10406fe4 Make change and version bump to TQ2A.230405.001
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21359524'] into tm-qpr2-release.

Change-Id: Ie61ad93088e05ba456ce67b568edefd4260ab189
2023-02-14 18:21:39 +00:00
Steve Berbary
b1bdb64c74 Update Security String to 2023-04-05
Bug: 268558932
Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
(cherry picked from commit c29c047fd1)
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
2023-02-14 18:15:34 +00:00
Zhenhuang Wang
23d8c72472 Revert "Revert "Enable -sha256 feature to some Soong built zip files""
This reverts commit 7d8eeec0dd.

Reason for revert: re-submit the change https://r.android.com/2393272

Change-Id: I6c906a82823a4b69d0cd8a5ce364d802c646cb68
2023-02-14 00:29:30 +00:00
Cory Barker
12727fceab Build java fuzz targets with one build target instead of needed a host target and device
Test: built locally and verified fuzzers with Jazzer

Change-Id: Icb1ecef1920fa1ba6d4492acdd3b37093964eb84
2023-02-13 17:44:07 +00:00
Android Build Coastguard Worker
5ca47f57b1 Version bump to TQ2A.230305.008 [core/build_id.mk]
Change-Id: I20a857714f506097c06cf8168b7ec368a3117612
2023-02-11 17:28:31 +00:00
Treehugger Robot
7462cb6956 Merge "Support BOARD_SYSTEM_DLKM_SRC build config" am: fa7113c696 am: 6dd3de71fc am: 4b9bb421c8
Original change: https://android-review.googlesource.com/c/platform/build/+/2411433

Change-Id: If07576b897ac968d8dcf0466cf0c44df07a10fa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 11:54:57 +00:00
Treehugger Robot
4b9bb421c8 Merge "Support BOARD_SYSTEM_DLKM_SRC build config" am: fa7113c696 am: 6dd3de71fc
Original change: https://android-review.googlesource.com/c/platform/build/+/2411433

Change-Id: I9a502e10075a81694878ed1a61fe63e449d83251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 10:58:14 +00:00
Treehugger Robot
6dd3de71fc Merge "Support BOARD_SYSTEM_DLKM_SRC build config" am: fa7113c696
Original change: https://android-review.googlesource.com/c/platform/build/+/2411433

Change-Id: I68642f18887195be07f4c66f53cf8bdeda39d051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 10:11:57 +00:00
Treehugger Robot
fa7113c696 Merge "Support BOARD_SYSTEM_DLKM_SRC build config" 2023-02-11 09:25:04 +00:00
Kelvin Zhang
0dbfd70963 Support BOARD_SYSTEM_DLKM_SRC build config
In aosp/2323114 , BOARD_SYSTEM_DLKM_SRC is removed in favor of
BOARD_SYSTEM_KERNEL_MODULES . However, BOARD_SYSTEM_DLKM_SRC preserves
directory structure of input kernel modules, where as
BOARD_SYSTEM_KERNEL_MODULES flattens everything by copying all modules
into the same directory. This causes some issues as vendor_dlkm that
depend on system_dlkm modules now need to update their modules.dep file
due to changes in path. For backward compatibility, add support
for BOARD_SYSTEM_DLKM_SRC .

When both BOARD_SYSTEM_DLKM_SRC and BOARD_SYSTEM_KERNEL_MODULES are
set, BOARD_SYSTEM_KERNEL_MODULES will be preferred. The priority is arbitrary,
but we need a defined ordering to prevent double copying.

Test: th
Bug: 267014648
Change-Id: Ib2f5229af02ea2b7c0d96da70afed9118f484c97
2023-02-10 21:06:53 -08:00
Steve Berbary
0f43799a5a Update Security String to 2023-04-01 am: 641c8e9c6b am: ac6cd2c238 am: af858ede19
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359394

Change-Id: Idee22c817ab2e2e047ce765e5a06a63cf290c811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 01:57:50 +00:00
Steve Berbary
af858ede19 Update Security String to 2023-04-01 am: 641c8e9c6b am: ac6cd2c238
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359394

Change-Id: I86a0cbbb0d37c3170cab80ff9e12fcee345f1ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 00:00:19 +00:00
Steve Berbary
9220c7a744 Update Security String to 2023-04-01 am: baf6b726c4 am: 2b6ea18ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359393

Change-Id: I0ef159ba430f7f91b97019abd25319c6cdf30a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 23:21:16 +00:00
Steve Berbary
051bd349b0 Update Security String to 2023-04-01 am: baf6b726c4 am: 2b6ea18ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359393

Change-Id: I61c6de97027800c4aa5811211d8bdf5ae0d1c3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 23:19:39 +00:00
Steve Berbary
ac6cd2c238 Update Security String to 2023-04-01 am: 641c8e9c6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359394

Change-Id: Iaafdec728f0c42bea952f400f873d1987dd52561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 23:05:44 +00:00
Steve Berbary
2b6ea18ce1 Update Security String to 2023-04-01 am: baf6b726c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359393

Change-Id: Ia04dec818eced8ef204641ac224f2677c5ce67f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 22:12:01 +00:00
Steve Berbary
41d21675ed Update Security String to 2023-04-05 am: c29c047fd1 am: ae682f595d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359524

Change-Id: I6fc6ea339e1dc8f1eb2138aea29c37427d0579a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 18:44:12 +00:00
Steve Berbary
ae682f595d Update Security String to 2023-04-05 am: c29c047fd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359524

Change-Id: I161a0714844fdf3739595e4fa7a3eceb5ff6fe7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 18:01:15 +00:00
Zhenhuang Wang
045624ea85 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" am: 65ff0460c4 am: 97e73564c3 am: def1100a05
Original change: https://android-review.googlesource.com/c/platform/build/+/2430432

Change-Id: Ieee816e874720a88fae431c79470d8ac97a8b24e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 16:17:58 +00:00
Zhenhuang Wang
def1100a05 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" am: 65ff0460c4 am: 97e73564c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2430432

Change-Id: If36e0842638bd34c67b645bb0e4b4edd868df003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 15:29:50 +00:00
Zhenhuang Wang
97e73564c3 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" am: 65ff0460c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2430432

Change-Id: I947c01778145669c5cb36d3645f1cd6d43988674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 14:46:18 +00:00
Zhenhuang Wang
65ff0460c4 Merge "Revert "Enable -sha256 feature to some Soong built zip files"" 2023-02-10 14:11:49 +00:00
Zhenhuang Wang
7d8eeec0dd Revert "Enable -sha256 feature to some Soong built zip files"
This reverts commit fae06b15ce.

Reason for revert: Some labs are still not upgraded to the latest version, causing presubmit test flaky.

Bug: 268608699
Bug: 259513199
Change-Id: I05f0fef27afdbbd5350e77616074059b7bf1da42
2023-02-10 14:02:06 +00:00
Zhenhuang Wang
ede5c7217d Merge "Enable -sha256 feature to some Soong built zip files" am: 9544346d39 am: 5c8213b1bd am: 354552cfee
Original change: https://android-review.googlesource.com/c/platform/build/+/2393272

Change-Id: Ie1d90112c5ed79c70599f6cce0f8d61d8b60c47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 10:03:19 +00:00
Zhenhuang Wang
354552cfee Merge "Enable -sha256 feature to some Soong built zip files" am: 9544346d39 am: 5c8213b1bd
Original change: https://android-review.googlesource.com/c/platform/build/+/2393272

Change-Id: I10f6896ed8d003f143558deb840223155bc8e408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 09:09:33 +00:00
Zhenhuang Wang
5c8213b1bd Merge "Enable -sha256 feature to some Soong built zip files" am: 9544346d39
Original change: https://android-review.googlesource.com/c/platform/build/+/2393272

Change-Id: I151922ca28ec3f876298898c9a1ab00b55666f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 08:28:24 +00:00