Commit Graph

32226 Commits

Author SHA1 Message Date
Treehugger Robot
f0a814fa06 Merge "Check packages/modules before packing otatools keys" am: 2b392dd8ed
Original change: https://android-review.googlesource.com/c/platform/build/+/2280187

Change-Id: I2c4a67865a46bda70dfd4fb3668a4925a67bf83f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 06:22:17 +00:00
Hongguang
07babe080a Check packages/modules before packing otatools keys
Fix build error when packages/modules is not existed.

Bug: 256565230
Test: make dist, check otatools.zip
Change-Id: I4153b143e677e35f95a3d47663cb8efcde7abdbf
2022-11-01 00:33:25 +00:00
Treehugger Robot
504b57de34 Merge "Pack the mainline modules test keys into the otatools.zip" am: fb5f2de383
Original change: https://android-review.googlesource.com/c/platform/build/+/2276848

Change-Id: I225dff7f9467a9dcff5253c08a4dab50a8984de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 20:27:48 +00:00
Hongguang
547812d318 Pack the mainline modules test keys into the otatools.zip
Bug: 256565230
Test: make dist, check otatools.zip
Change-Id: I7c386ee8f8e3ec6f3d5c767504e23cb1f1bacad2
2022-10-31 10:25:29 -07:00
Anton Hansson
8bc854f604 Merge "Revert^2 "Update naming of platforms subdir"" am: 0cd509a08a
Original change: https://android-review.googlesource.com/c/platform/build/+/2276626

Change-Id: I61daac318096e00dfb1ce1fbeed5fb9298d34938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 13:24:54 +00:00
Anton Hansson
0cd509a08a Merge "Revert^2 "Update naming of platforms subdir"" 2022-10-31 12:57:30 +00:00
Treehugger Robot
5a69b09825 Merge "Speed up m command autocompletion" am: a56bce6ef1
Original change: https://android-review.googlesource.com/c/platform/build/+/2272251

Change-Id: I5c617649b184c2e48962993e38d88bd9b0755c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 21:20:31 +00:00
Treehugger Robot
a56bce6ef1 Merge "Speed up m command autocompletion" 2022-10-28 20:40:32 +00:00
Cole Faust
5d825b7a68 Speed up m command autocompletion
Generate a all_modules.txt file on every build that
can be used for autocompleting.

Because this adds time to every non-incremental build,
I profiled it by using `$(shell date +"%s.%3N")` before
and after, and disovered it only adds about 0.01 seconds
to the build. And of course it won't be rerun if there
weren't build changes.

Bug: 255867758
Test: Manually
Change-Id: I1d3f1008611fd542884322b27b19ea2fa1d341fe
2022-10-28 10:44:02 -07:00
Anton Hansson
874dbe7b1b Revert^2 "Update naming of platforms subdir"
This reverts commit 6137ffa5de.

Reason for revert: Roll-forward with fix for codename SDKs (PS2)

Test: m sdk dist in all 3 variants of branches
Change-Id: Iffdf650a43aa050d70e01f73d78cf622cb206fc6
2022-10-28 09:03:33 +00:00
Victor Liu
6fef3a984f Merge "Revert "Fix typo"" am: c8c98e3f00
Original change: https://android-review.googlesource.com/c/platform/build/+/2275208

Change-Id: Ibc00e398862aba8bcbb83578b51e7a51e7c6692e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 19:17:01 +00:00
Treehugger Robot
a2cd64e84f Merge "core: Use pvmfw_embedded_key for INTERNAL_PVMFW_EMBEDDED_AVBKEY" am: 30b4bde37a
Original change: https://android-review.googlesource.com/c/platform/build/+/2271150

Change-Id: I8955f52768d2d0311816eb4cfc6f25b45923a34a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 19:16:25 +00:00
Victor Liu
c8c98e3f00 Merge "Revert "Fix typo"" 2022-10-27 19:11:31 +00:00
Brad Hinegardner
3e7f6b737c Revert "Fix typo"
Revert "Revert ^2 "Prevent unspecified values in soong_config_st..."

Revert submission 2262062-colefaust_soong_config_string_variable_2nd_try

Reason for revert: breaks builds, b/255996492 among others
Reverted Changes:
I3e2f59e5f:Fix typo
Id3bcd9a46:Revert ^2 "Prevent unspecified values in soong_con...

Change-Id: I9a9a150844c19eb8421575f5753b335f80ab6c66
2022-10-27 19:01:15 +00:00
Treehugger Robot
30b4bde37a Merge "core: Use pvmfw_embedded_key for INTERNAL_PVMFW_EMBEDDED_AVBKEY" 2022-10-27 18:47:43 +00:00
Spandan Das
222612ec80 Merge "Migrate check_elf_file.py to python3" am: 03b846ff37
Original change: https://android-review.googlesource.com/c/platform/build/+/2272926

Change-Id: I38ee36575345abe226e2c0b5e52e42564fdc56e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 17:36:19 +00:00
Cole Faust
302b2473b7 Merge "Fix typo" am: eef714a380
Original change: https://android-review.googlesource.com/c/platform/build/+/2272127

Change-Id: I5a6a3db3af1a166c509c2114bbb72ef6bbe52ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 17:35:50 +00:00
Spandan Das
03b846ff37 Merge "Migrate check_elf_file.py to python3" 2022-10-27 16:46:18 +00:00
Cole Faust
eef714a380 Merge "Fix typo" 2022-10-27 16:41:29 +00:00
Yi-yo Chiang
4d6be0d112 Merge "Reland "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"" am: ed5649636a
Original change: https://android-review.googlesource.com/c/platform/build/+/2269466

Change-Id: Ida06ff58b467723e5ab1947d572286ed470e0a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 09:04:04 +00:00
Yi-yo Chiang
ed5649636a Merge "Reland "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"" 2022-10-27 08:26:54 +00:00
Spandan Das
60b8195c83 Migrate check_elf_file.py to python3
Also, create a python_binary_host so that it runs using the hermetic
python toolchain.

Test: m check-elf-files
Bug: 203436762
Change-Id: I964342a27f6b6c9dcdbbe910d4dc6c9ec00c2213
2022-10-27 02:08:23 +00:00
Cole Faust
841ef28d32 Fix typo
build_test is only run on presubmit in internal master
for cls that change build/make and a few other repos,
but notably not build/soong. Add this cl to a topic
with a build/soong change we'd like to test with build_test.

Bug: 220375749
Test: Presubmits
Change-Id: I3e2f59e5f341cce486368dac9bf2f28f265e53fd
2022-10-26 11:24:06 -07:00
Treehugger Robot
31a13d8c6d Merge "Revert "Update naming of platforms subdir"" am: b41bb81505
Original change: https://android-review.googlesource.com/c/platform/build/+/2271346

Change-Id: Ia6e6d8baead21d96f18c591351901a4a5a186a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 18:00:56 +00:00
Treehugger Robot
b41bb81505 Merge "Revert "Update naming of platforms subdir"" 2022-10-26 17:17:28 +00:00
Pierre-Clément Tosi
615f081bcf core: Use pvmfw_embedded_key for INTERNAL_PVMFW_EMBEDDED_AVBKEY
Instead of wrongly using the key that was used to sign pvmfw, we should
have been using the key that pvmfw will use to verify payloads it
receives so fix that.

Bug: 255575669
Test: -
Change-Id: I68a87a092c1aa4a60f4fbe60c5ddf82c4e34c38a
2022-10-26 16:05:16 +01:00
Alan Viverette
6137ffa5de Revert "Update naming of platforms subdir"
This reverts commit 8b22209184.

Reason for revert: Doesn't match install path for pre-release SDKs

Change-Id: Ic1ce28e57692d27d08d33dee5b7403bf1bf1b655
2022-10-26 14:35:54 +00:00
Yi-yo Chiang
05c0807f2f Reland "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"
This reverts commit d6e2c8f84d.

Reason for revert: downstream branches are fixed

Change-Id: I55fa6e8db37d0b7d040679f54be238b512437d29
2022-10-25 17:46:10 +00:00
Cole Faust
b49fa9ab2f Merge "Delete java-layers.py" am: 3b9af315d2
Original change: https://android-review.googlesource.com/c/platform/build/+/2267708

Change-Id: I3ff80efbeede00e9e4cd854bac6021414d4ee550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 17:41:23 +00:00
Cole Faust
6a75c4f782 Delete java-layers.py
There are no usages of LOCAL_JAVA_LAYERS_FILE,
and java-layers.py was written in python 2.

Bug: 203436762
Test: Presubmits
Change-Id: I1be0f2547757a853e20811f28529479487037e94
2022-10-24 18:15:54 -07:00
Treehugger Robot
6959dea6ad Merge "Revert "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"" am: 3946ea0318
Original change: https://android-review.googlesource.com/c/platform/build/+/2267723

Change-Id: I381e453bbf60c527068a5b87b2faad828dc4ea81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-24 16:11:21 +00:00
Treehugger Robot
3946ea0318 Merge "Revert "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"" 2022-10-24 15:32:05 +00:00
Yan Han
d6e2c8f84d Revert "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"
This reverts commit 2bd45d0fd8.

Reason for revert: b/255298902

Change-Id: If0b006b0d88dd08ff116abc50d7b9dd4c8ea5806
2022-10-24 12:58:31 +00:00
Yi-yo Chiang
dc4666dd81 Merge "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var" am: b72a874d4d
Original change: https://android-review.googlesource.com/c/platform/build/+/2253578

Change-Id: I12ba4b6fc0933f7993ad4375f9da28160dc51375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-24 09:53:15 +00:00
Yi-yo Chiang
b72a874d4d Merge "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var" 2022-10-24 09:25:25 +00:00
Colin Cross
9ef943e21b Merge "Add a phony target to dist ndk_sysroot.tar.bz2" am: 516cf13c05
Original change: https://android-review.googlesource.com/c/platform/build/+/2263924

Change-Id: I40f4bd1ebe3f91c94796ad28178190eb292050c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 00:59:18 +00:00
Colin Cross
516cf13c05 Merge "Add a phony target to dist ndk_sysroot.tar.bz2" 2022-10-21 00:35:28 +00:00
Colin Cross
ec65b76217 Add a phony target to dist ndk_sysroot.tar.bz2
Test: lunch aosp_riscv64-userdebug && m ndk_sysroot
Change-Id: I9e1a7da8cd837fa50503f6458ed6b91829611a61
2022-10-20 14:03:47 -07:00
Anton Hansson
1c4cc15815 Merge "Update naming of platforms subdir" am: 2e55cb4f6b
Original change: https://android-review.googlesource.com/c/platform/build/+/2259482

Change-Id: Icadacabc6f5b37d9793b081e4e98dbf3c98e4512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 12:33:10 +00:00
Anton Hansson
2e55cb4f6b Merge "Update naming of platforms subdir" 2022-10-19 11:52:32 +00:00
Devin Moore
88e459c57c Merge "Restrict the framework manifest check against frozen files" am: ee4bc816c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2254735

Change-Id: Ib8cc13296120c5aed25552982c7aa9fe8d5a0d4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 15:57:52 +00:00
Devin Moore
ee4bc816c3 Merge "Restrict the framework manifest check against frozen files" 2022-10-18 15:22:32 +00:00
Anton Hansson
8b22209184 Update naming of platforms subdir
The build system previously named the platforms subdir by
PLATFORM_VERSION, which is 13 for android 13, aka T, so the subdir
name would be android-13.

Android studio installs the SDK into a subdir identified by the api
level, so android-33 for android T, and also the extension api level
for extension SDKs, e.g. android-33-ext4.

Update the build system subdir name to match the android studio install
path, in order to avoid confusion and make it simpler to just unzip
a built SDK into the platforms dir, avoiding the need to provide a
package.xml file for studio to install it correctly.

Bug: 254023524
Test: m sdk sdk_repo dist, verify subdir is android-33 in:
   $ zipinfo -1 out/dist/android-sdk_eng.hansson_linux-x86.zip \
     | cut -f 1-3 -d '/' | grep platforms | sort | uniq
Change-Id: I1d3a7fd4c480859c28cdcbcb8c0cf2800ac4a1d7
2022-10-18 13:43:46 +00:00
Yi-Yo Chiang
2bd45d0fd8 Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var
Bug: 241346584
Test: Presubmit build_test
Change-Id: I5fc9fd98dccd24ce31f493f63841ee049e7fc5b7
2022-10-18 09:39:23 +00:00
Yi-yo Chiang
f2044b0ace Merge "Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 163ece5b55
Original change: https://android-review.googlesource.com/c/platform/build/+/2242918

Change-Id: If632dd03a2b7e72907155d39ae7e6e40bb8445c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 07:20:20 +00:00
Yi-yo Chiang
163ece5b55 Merge "Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" 2022-10-18 06:57:24 +00:00
Treehugger Robot
506c9c38d4 Merge "Add 'dump_apex_info' to otatools package." am: 0923b6fe09
Original change: https://android-review.googlesource.com/c/platform/build/+/2257865

Change-Id: Ie068520abcb50f387727c50cbf9c8960d989217c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 20:52:18 +00:00
TreeHugger Robot
2845a74374 Merge "Revert "Revert "Target dist files not dist goals.""" into stage-aosp-master 2022-10-17 20:37:56 +00:00
Devin Moore
62d0a739bb Restrict the framework manifest check against frozen files
This only needs to be done for GSI targets that need to remain
compatible with previously frozen manifests so they continue to work for
older upgrading devices.

Test: lunch aosp_cf_x86_64_phone && m
Test: lunch aosp_arm64 && m
Test: both tests with and without android.hidl.manager served on device
Bug: 218588089
Change-Id: I34862b08cd4ba4c554b5fe9db0eeacba60a0c33a
2022-10-17 19:48:46 +00:00
Baligh Uddin
67ab689271 Add 'dump_apex_info' to otatools package.
BUG: 253963880
Test: Treehugger.
Change-Id: I795e6f85bfb6924a073e00b77c83e83eee8e30fa
2022-10-17 17:17:42 +00:00