Kelvin Zhang
25d69c8bf5
Temporary hack for making T->S downgrade work
...
Downgrade OTA was broken because generic_ramdisk was removed from boot
partition in android T. Neither does O6 have init_boot. O6 also doesn't
include generic ramdisk in vendor boot, so no way for otatools to locate
contents of generic ramdisk. As a hack, omit boot partition timestamp if
we can't find ramdisk.
Test: generate T->S downgrade OTA for O6
Bug: 231656318
Merged-In: I9f5359462332aadadc324348873a3a4b2b126068
Change-Id: I9f5359462332aadadc324348873a3a4b2b126068
2022-05-10 05:06:47 +00:00
Kelvin Zhang
f4406ca129
Merge identical key/val pairs in dynamic partition info
...
We might add new values to dynamic_partition_info.txt, so some kind of
generic fallback mechanism is needed. If keys are different, we need to
decided on a case-by-case basis which side takes precedence. For
example, Virtual AB requires vendor support, so vendor side takes
precedence. VABC on T+ devices are implemented entirely in system, so
system/framework side takes precedence.
Bug: 230876542
Test: th
Change-Id: I67747368547d3ef3e29ad64f8f818ef4c5896246
(cherry picked from commit 6a683ce02b
)
Merged-In: I67747368547d3ef3e29ad64f8f818ef4c5896246
2022-05-06 21:40:14 +00:00
Iavor-Valentin Iftime
42a7160300
Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am: 71585eae2b
am: 7ee275cb81
am: 9fd594c53c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068347
Change-Id: Id6c31fc941b14f5349b3b43f314c1a97872a4b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:06:22 +00:00
Iavor-Valentin Iftime
71585eae2b
Merge "Rebuild and copy recovery and boot img when using vendor_otatools"
2022-04-21 16:07:12 +00:00
Lucas Wei
035fdee0ef
Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" am: 2d5ecef1b3
am: bd66e32393
am: b8b3c0d0ab
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064760
Change-Id: Ibcf742f858c37141ab59cbd2d9c589ae15cf6ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:48:40 +00:00
Lucas Wei
2d5ecef1b3
Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot"
2022-04-21 03:07:15 +00:00
Lucas Wei
03230250a3
vendor_kernel_boot: Update releasetools for vendor_kernel_boot
...
add_img_to_target_files.py will re-make image and build a new
signed vbmeta.img with new images in target-file.
We need to add vendor_kernel_boot into AVB signing list and make it
support that image.
Test: make dist -j110 and check vbmeta.img
Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Id07433f3dc33f95e2edd49de890f1e098cb9ef31
2022-04-21 00:27:27 +08:00
Treehugger Robot
7ec455ad93
Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113
am: fa33ae6ff8
am: 1a73e98758
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761
Change-Id: I1e8ff054b8a9946bacf605f7565bbbc7941badeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:03:43 +00:00
Iavor-Valentin Iftime
40adb17a1c
Rebuild and copy recovery and boot img when using vendor_otatools
...
Rebuild recovery and boot images with vbmeta footers and copy together with recovery patch/install files when building vendor images using vendor otatools. Fixes validate_target_files failure.
Bug: 220126689
Bug: 186097910
Test: sign_target_files_apks \
--vendor_otatools=otatools_vendor_dir \
--vendor_partitions=vendor,odm \
merged-target_files.zip \
signed-target_files.zip
Test: validate_target_files signed-target_files.zip
Change-Id: Id45c67405bc37b769757db1701507f82cc6068d3
2022-04-19 18:35:36 +00:00
Bowgo Tsai
85578e0a9d
Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK
...
GKI targets, e.g., `gki_arm64` or `gki_x86_64` have only
boot-*.img files without a ramdisk. It has no other images,
e.g., init_boot.img, system.img, etc.
The current build system assumes that the ramdisk is either
in a boot.img or in a init_boot.img, which is not true for
those GKI targets. Adding a new flag to support building
boot-*.img without a ramdisk while not building an init_boot.img.
Bug: 220834917
Test: build and `unpack_bootimg`
Change-Id: I789343c3e3d9ff0c36c0e19680a9792bd31a1c9f
2022-04-19 17:57:51 +08:00
Treehugger Robot
f1efdd1877
Merge "Add build flags for legacy EROFS support." am: 80d2c8f7a7
am: 05c690dd2e
am: 2d16d3be49
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2009556
Change-Id: Iffa5eaf98453601e7edf7f012c28bcb1438193f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 06:15:22 +00:00
Treehugger Robot
80d2c8f7a7
Merge "Add build flags for legacy EROFS support."
2022-04-16 05:10:04 +00:00
Treehugger Robot
8c466713ba
Merge "Rename listshare and checkshare." am: e487fa3ccb
am: 4a2f1f84d0
am: cb37ac62d4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2063382
Change-Id: I60de77769edf786c0d91098a5e340a37328a5f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:19:19 +00:00
Treehugger Robot
e487fa3ccb
Merge "Rename listshare and checkshare."
2022-04-14 22:09:15 +00:00
Cole Faust
28afecfd45
Merge "Remove usages of long-form variables" am: b760b469c7
am: 85f941cf3a
am: c091ee15fb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064287
Change-Id: I2610a8c39679c34cb82cb4dbd679dadf5f797666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 18:23:48 +00:00
Cole Faust
81f1e92ed8
Remove usages of long-form variables
...
The long-form variables (PRODUCTS.<makefile>.<variable>)
are used to get information about multiple products.
However, they've never really worked correctly, and so
importing multiple products is deprecated behavior.
Remove as many usages of the long-form variables and
multi-product imports as possible.
Bug: 228518445
Test: Manually
Change-Id: I0b67f16360ff8bdcdb39638de739440472bccf76
2022-04-13 15:49:56 -07:00
Melisa Carranza Zúñiga
93fa6589df
Merge "Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9
am: 5a0d81a0be
am: 54e08307dc"" into tm-dev
2022-04-13 20:36:42 +00:00
Bob Badour
213095a919
Rename listshare and checkshare.
...
Bug: 151177513
Bug: 213388645
Bug: 210912771
Test: m droid dist reportmissinglicenses
Change-Id: I223c4496d776a1bbd4fdce31ed79a638ed3491d8
2022-04-13 11:04:43 -07:00
Melisa Carranza Zúñiga
61e1dd0da5
Revert "Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9
am: 5a0d81a0be
am: 54e08307dc"
...
This reverts commit 8fe9e3a2c7
.
Reason for revert: Updateable SEPolicy is punted.
Change-Id: I28ae2afbb1083e215f4e0a27a9164133cd73dd76
2022-04-13 16:23:45 +00:00
Melisa Carranza Zúñiga
ef72d2822e
Merge "Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0
am: bd8c313275
am: a2db49becd"" into tm-dev
2022-04-13 13:51:51 +00:00
Melisa Carranza Zúñiga
69e6d82106
Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0
am: bd8c313275
am: a2db49becd"
...
This reverts commit 6e6c22c70e
.
Reason for revert: Updateable SEPolicy is punted.
Change-Id: I99524d13811028a4036aa85c74cf10974fe08165
2022-04-12 23:22:11 +00:00
Treehugger Robot
8a3608e5f4
Merge "change logtags dependency to provide java sources" am: 84a39ac3f0
am: 1b14ac6ba6
am: 2f101fbc2b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2045664
Change-Id: Icdd5a31eefe6c09c29fbddc6d07efcf610dc673e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 23:49:42 +00:00
Treehugger Robot
84a39ac3f0
Merge "change logtags dependency to provide java sources"
2022-04-08 22:37:22 +00:00
Yuntao Xu
69caac0966
Merge "Make file list by partitions for all lunch targets" am: 722d0a602a
am: 990145b2ad
am: 6a9f5909ca
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2034494
Change-Id: I9fc699864750a3b7c0893ffbb9315572a2bfc24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:08:51 +00:00
Yuntao Xu
722d0a602a
Merge "Make file list by partitions for all lunch targets"
2022-04-08 15:29:15 +00:00
Yuntao Xu
c21dc3c8c1
Make file list by partitions for all lunch targets
...
1. Filtered out the Android.mk file if the Make modules on them are
not in the PRODUCT_PACKAGES or the correspoding deps;
2. Merged the Android.mk file list by partitions for all lunch targets.
Bug: 225256154
Test: lunch aosp_coral-eng; m
out/target/product/coral/mk2bp_remaining.html
Test: python3 build/make/tools/mk2bp_partition.py
Change-Id: I40919e81ab3c6bd516379f0acd72932e8db50088
2022-04-07 11:01:19 -07:00
Sam Delmerico
b6fe473734
change logtags dependency to provide java sources
...
This rule originally used an android_library because it needed access to
SDK methods, but we can instead just provide Java sources and expect the
dependee to link the SDK methods.
Test: enabled QuickSearchBox and build
Change-Id: I7f1cdbea49e100ecc0944f8caa39683fb73016fb
2022-04-05 16:06:46 +00:00
Orion Hodson
8208530fa6
Merge "Update checkowners.py to support python3" am: 2f4e021780
am: 982f400a15
am: 6542d0fcf5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2053986
Change-Id: Id917b37ad4d5aefcbc42baa2a9108a2d6899a0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 11:22:03 +00:00
Orion Hodson
2f4e021780
Merge "Update checkowners.py to support python3"
2022-04-05 08:22:38 +00:00
Treehugger Robot
10976c77b2
Merge "Remove regex functionality from rbcrun" am: bd78ed0726
am: 1b7d02336d
am: 39a0861614
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2048503
Change-Id: I0013f0e3891f6082de46419f1893dd0da34055c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 21:35:20 +00:00
Orion Hodson
e421668192
Update checkowners.py to support python3
...
Update generated with 2to3.
Bug: N/A
Test: manually check OWNERS files
Change-Id: Idccc7ba36351854fe2b7a669a99c97f3f3a03d0e
2022-04-04 13:22:38 +01:00
Cole Faust
62878a2cef
Remove regex functionality from rbcrun
...
As a first step to making .rbc files compatible with bazel,
remove regex support since bazel doesn't have it.
Fixes: 227384703
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I8b946c20cc42897a47a5516a167732f4e16b6158
2022-03-30 12:00:15 -07:00
Treehugger Robot
0e9fbfd393
Merge "Support OUT_DIR for license graph." am: bc8d61f17b
am: 443a7b25e3
am: f74478b33b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2036930
Change-Id: I18d97926c690708b1c889d8e9cabe1ee97e15382
2022-03-24 05:07:20 +00:00
Treehugger Robot
22eb25791a
Merge "Revert "Rename init_boot properties to ro.init_boot.*"" am: 477b8e0561
am: 5e294a92bf
am: 7895babcad
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2039666
Change-Id: Ife828081d6040819614cd26a83a20cccbf709a2a
2022-03-24 05:02:38 +00:00
Treehugger Robot
bc8d61f17b
Merge "Support OUT_DIR for license graph."
2022-03-24 00:43:58 +00:00
Treehugger Robot
477b8e0561
Merge "Revert "Rename init_boot properties to ro.init_boot.*""
2022-03-23 23:27:02 +00:00
Bob Badour
c778e4cba4
Support OUT_DIR for license graph.
...
Bug: 226066987
Test: OUT_DIR=/tmp/outdir m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: OUT_DIR=/tmp/outdir m /tmp/outdir/target/product/bonito/obj/NOTICE.xml.gz
Test: m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: m out/target/product/bonito/obj/NOTICE.xml.gz
Change-Id: I6282c647a389c5935d5ce7c79193f86d32c76365
2022-03-23 14:12:12 -07:00
Kelvin Zhang
8250d2cd9e
Revert "Rename init_boot properties to ro.init_boot.*"
...
This reverts commit 411fac84d6
.
Reason for revert: b/226318737
Change-Id: Ie1cf0e79b3ac11b91e031a479898a54856020500
2022-03-23 19:46:09 +00:00
Melisa Carranza Zúñiga
6e6c22c70e
Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0
am: bd8c313275
am: a2db49becd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2028269
Change-Id: Id27f7043ca2122cf43adf59e48843ffe5a445359
2022-03-22 18:46:25 +00:00
Treehugger Robot
7ecab5ff11
Merge "Rebuild and copy recovery patch files when using vendor_otatools" am: 93d7c150c9
am: c4a7031063
am: 07326c0417
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2036543
Change-Id: Ic5871105c9867d22ee3666e6be02c523c6c5b493
2022-03-22 18:05:26 +00:00
Melisa Carranza Zúñiga
fb042449e0
Merge "Adding sepolicy sign params to sign_target_files_apks."
2022-03-22 18:00:43 +00:00
Lucas Wei
e39d6af2de
Merge "Make build support vendor_kernel_boot image" am: 8842016b30
am: 2dc9c52861
am: 3afd8feae8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2018599
Change-Id: I6fa0c4681ab6f974c97ac8112ad398de9f62d6a0
2022-03-22 14:33:50 +00:00
Iavor-Valentin Iftime
246a5c069a
Rebuild and copy recovery patch files when using vendor_otatools
...
Rebuild recovery and copy recovery patch/install files when building vendor images using vendor otatools. Fixes ota_from_target_files failure.
Bug: 220126689
Bug: 186097910
Test: sign_target_files_apks \
--vendor_otatools=otatools_vendor_dir \
--vendor_partitions=vendor,odm \
merged-target_files.zip \
signed-target_files.zip
Change-Id: I4a415417e0d7b1bcd548292ec8f3a12570ec65f0
2022-03-22 13:51:10 +00:00
Lucas Wei
8842016b30
Merge "Make build support vendor_kernel_boot image"
2022-03-22 13:48:34 +00:00
Yi-yo Chiang
f3309640bd
Merge "Rename init_boot properties to ro.init_boot.*" am: e5ed34824f
am: f773aa245f
am: c69d4ddf3d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2026283
Change-Id: I256d377d8c18c557d9b6ecd4a484f2eaf8bca3ca
2022-03-22 10:32:04 +00:00
Yi-yo Chiang
e5ed34824f
Merge "Rename init_boot properties to ro.init_boot.*"
2022-03-22 09:13:32 +00:00
Melisa Carranza Zuniga
e6d4fb5ae6
Adding sepolicy sign params to sign_target_files_apks.
...
Bug: b/217570541
Test: sign_target_files_apks --sepolicy_key=build/make/tools/releasetools/testdata/testkey_RSA4096.key
--sepolicy_cert=build/make/tools/releasetools/testdata/testkey.x509.pem target_files.zip target_out.zip
Change-Id: I4ae9f2a3297d10de68c6444dea1cd9996ad9dd11
Change-Id: I4a1ac7009ae0d6bb53c74bd34f8c74f12ea0a3b8
2022-03-21 22:56:33 +00:00
Treehugger Robot
5444cac49a
Merge "Copy vendor & odm .map files when using vendor_otatools" am: 6b3e5294db
am: 32764d5b7e
am: 0bd3600b17
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2030363
Change-Id: I3f59d2477461f1027bedb44458b1510d39db1657
2022-03-17 19:44:52 +00:00
Iavor-Valentin Iftime
880e4432b9
Copy vendor & odm .map files when using vendor_otatools
...
Copy IMAGES/vendor.map and IMAGES/odm.map files when building vendor images
using vendor otatools. Fixes validate_target_files failure.
Bug: 220126689
Bug: 186097910
Test: sign_target_files_apks \
--vendor_otatools=otatools_vendor_dir \
--vendor_partitions=vendor,odm \
merged-target_files.zip \
signed-target_files.zip
Change-Id: Iaf904c90761b3830cf81af2561695c81bfc6c70d
2022-03-17 14:02:30 +00:00
Lucas Wei
f57333f7fc
Make build support vendor_kernel_boot image
...
Add vendor_kernel_boot image for vendors whose bootloader support
extra first stage booting kernel modules ramdisks. This benefit
kernel repo to build kernel-artifacts only image without Andorid
artifacts dependency.
Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: If07218b86a7751b3d452a172610af960f5f9ec74
2022-03-16 23:13:19 +08:00