tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
87795 commits 1 branch 0 tags 119 MiB
Commit graph

2883 commits

Author SHA1 Message Date
Automerger Merge Worker
36e9b018a1 Merge "Merge "Support generating partial OTAs from extracted target_files" am: c3216a321b" into stage-aosp-master am: abb6ca7ab3 am: 4cc1379797 am: d506fc5b65 am: 2e2f826087 am: edaf0ce34e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2577071

Change-Id: I44da8e2c4a0efd8b409a7af339d65b6a59995323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:37:53 +00:00
Treehugger Robot
5e4f59f9ca Merge "Support generating partial OTAs from extracted target_files" am: c3216a321b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2577071

Change-Id: I79fa834772dc12fe26678238bcf80ecffd2a34ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 00:54:58 +00:00
Kelvin Zhang
6b10e15acc Support generating partial OTAs from extracted target_files 
This allows the build system to potentially paralleize generation of OTA
package and zipping of target files

Bug: 262185376
Bug: 227848550
Change-Id: I90b6c25761683ebe3803b22fc8e23540a5282c66
 2023-05-02 20:48:14 -07:00
Treehugger Robot
5d041c07fc Merge "Use misc_info.txt to check for VABC" am: ed1ab26f5d am: 8583eae383 am: 764d7c01e7 am: 8359a9fc2a am: 24652b0778 am: b4c745c2a2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2572975

Change-Id: I8042206e83407c39984e0e9b62bfb4a1faf4eab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:42:57 +00:00
Treehugger Robot
8583eae383 Merge "Use misc_info.txt to check for VABC" am: ed1ab26f5d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2572975

Change-Id: I2ef6cf286ed259dafc20f8bb1f4b0388a32b5fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 22:41:40 +00:00
Kelvin Zhang
e634bde6bd Use misc_info.txt to check for VABC 
Change-Id: I77f23a51ddb027254ccda8d7ab17e64205522300
 2023-04-28 23:59:43 -07:00
Daniel Zheng
e1d50c0c4a Merge "Add --max_threads to OTA generation" am: 15c296958b am: fe2a0816b6 am: ea71ab22cf am: 88918594ea am: 340819636b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563130

Change-Id: Ia8a4b654766603d8d17859eb53415934ce90f09e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 00:19:28 +00:00
Daniel Zheng
fe2a0816b6 Merge "Add --max_threads to OTA generation" am: 15c296958b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563130

Change-Id: Ibd5d90c7661ecf3367485cf43b887c2cefcde544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 22:27:31 +00:00
Daniel Zheng
15c296958b Merge "Add --max_threads to OTA generation" 2023-04-26 21:53:53 +00:00
Daniel Zheng
a30989bafa Add --max_threads to OTA generation 
Adding an option to configure max number of threads used during
ota_from_target_files

Bug: 277794445
Test: tested ota_from_target_files
Change-Id: I9bae92ee43c21926434ab04563a2b4f0678b73eb
 2023-04-26 10:52:12 -07:00
Treehugger Robot
702bdcc590 Merge "Support to merge PREBUILT_IMAGES" am: dd62b0da0f am: 5939a80763 am: c42fcf9acd am: f56f8e3d0d am: 2e56f6d4c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512522

Change-Id: I36a64dc3b338465806069ea94bcd2f0d337fddb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 08:59:41 +00:00
Treehugger Robot
5939a80763 Merge "Support to merge PREBUILT_IMAGES" am: dd62b0da0f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512522

Change-Id: I67339cb1a8108577522bd3446e868adbe3385439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 05:17:11 +00:00
Treehugger Robot
dd62b0da0f Merge "Support to merge PREBUILT_IMAGES" 2023-04-25 04:24:20 +00:00
Treehugger Robot
5d0bc13791 Merge "Fix incremental OTA generation failures" am: 5ca02ff114 am: 5970bf338b am: 898373872f am: b09c838d8d am: eee7d9820b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2553374

Change-Id: Id63486a372b59a63a5f040679fe77eefc6a78998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-22 04:48:10 +00:00
Treehugger Robot
5970bf338b Merge "Fix incremental OTA generation failures" am: 5ca02ff114 
Original change: https://android-review.googlesource.com/c/platform/build/+/2553374

Change-Id: I17880a243562b821a634715b242677de52ba6d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-22 02:04:12 +00:00
Kelvin Zhang
ca45d7a85d Fix incremental OTA generation failures 
source_file might be a directory, use the _ReadApexInfo() helper
function to read it instead of go straight to zipfiles.

Test: build incremental OTA for pixel
Bug: 279142680
Bug: 227848550
Bug: 277028723

Change-Id: Ia0041e2c72c1a57123519c970f6e734194a81cd2
 2023-04-21 17:30:50 +00:00
Xin Li
d6b6d0102a Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 
Bug: 275386652
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Change-Id: I900022a8e8f104b6dc52745211c428601be53ba6
 2023-04-21 09:49:08 -07:00
Treehugger Robot
837078be7a Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 am: 3de45a7b2b am: 4f600c2a34 am: c30753213c am: 8329956277 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: Ibc2926c0b04d6aad80f983a8b1e3b71565dfa2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 18:38:26 +00:00
Treehugger Robot
4f600c2a34 Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 am: 3de45a7b2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: Ia718bce15427ad03c434f594b004429972623a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 16:28:01 +00:00
Kelvin Zhang
9dbe2ce40f Allow ota_from_target_file to work entirely on directories 
When building android, build system will first zip target_file directory
into a .zip file, and then invoke ota_from_target_files. We
ota_from_target_files can work directly on top of directories, we can
parallelize OTA generation and target_file zipping, making builds
faster.

Bug: 227848550
Bug: 277028723
Test: th
Change-Id: Id72bd7cca708af0e1bae2db754f39b27777cd601
 2023-04-18 17:47:29 -07:00
Po Hu
81c3f4a884 Support to merge PREBUILT_IMAGES 
For example, pvmfw.img comes from framework target files package
and dtbo.img comes from vendor target files package.

Test: merge_target_files
Change-Id: If2e6fac5ce3671e3387e801808a195fb7b2c55b5
 2023-04-19 08:23:40 +08:00
Treehugger Robot
c2b6f0e27b Merge "Fix duplicate super_empty.img" am: 67ca3c05c7 am: 8670880361 am: 0e04817b44 am: 9362cc8e1c am: 44f41fa793 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970

Change-Id: Ibd7fa46fb5e7288b39e58985feb94a958e4a9599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 23:51:34 +00:00
Treehugger Robot
53dc49bd49 Merge "Try with search_path for some avb path args" am: b7a45ea13d am: 56c66e00bf am: e313385cba am: e9b57353f7 am: 280bf796fb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380

Change-Id: I443de03d5627b2d1c335bbcb19f4e3f35e783e54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 23:50:25 +00:00
Treehugger Robot
0e04817b44 Merge "Fix duplicate super_empty.img" am: 67ca3c05c7 am: 8670880361 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970

Change-Id: I01db0c5e3d039df6a61c880d7a1cfeaa8dba7967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:05:20 +00:00
Treehugger Robot
e313385cba Merge "Try with search_path for some avb path args" am: b7a45ea13d am: 56c66e00bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380

Change-Id: I10d545710dcdbd4b0c203ae316f72a88cf7d7ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:03:36 +00:00
Treehugger Robot
67ca3c05c7 Merge "Fix duplicate super_empty.img" 2023-04-17 21:19:13 +00:00
Treehugger Robot
b7a45ea13d Merge "Try with search_path for some avb path args" 2023-04-17 20:43:12 +00:00
Kelvin Zhang
aecdc18222 Fix duplicate super_empty.img 
When calling add_img_to_target_files twice, super_empty.img will be
written twice, and resulting zip would contain duplicate entries.

Test: th
Bug: 278522974
Change-Id: I2419d0c4f8b04f876a8cc69a1517f59cab94d75d
 2023-04-17 09:52:39 -07:00
David Anderson
1da5082c13 Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc am: 70e4fa03b7 am: 236b709dcd am: e78f998ebf am: 050dac8b3b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094

Change-Id: Ic532571cc0e0265268106509368f1b9391bfb60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 08:06:52 +00:00
David Anderson
236b709dcd Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc am: 70e4fa03b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094

Change-Id: I87172391727ae2b8fe4735aa1f7c1c9bef11098c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 06:01:17 +00:00
David Anderson
23c2df71bc Merge "ota_from_target_files: Disable XOR on <T vendor." 2023-04-15 04:52:46 +00:00
Treehugger Robot
28c5659401 Merge "Revert "Remove all ZIP64LIMIT hack"" am: 7b640806da am: 78667a4692 am: 4fdafe37f3 am: 98145fb730 am: 11ff3bd322 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535093

Change-Id: I9192a05e0bbb3dc7fcc17c6ca6ef98840bb8be53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 04:17:19 +00:00
Dennis Song
77bb793f45 Merge "Include META/* in the vendor item list when rebuild-sepolicy" am: 5da012adb0 am: e890d0008c am: 2e63bdb6d0 am: 2009c248db am: 19b0e9916b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535541

Change-Id: Ia1bf2948d00bee5773516126b7321d27f0f6b78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 04:15:19 +00:00
Treehugger Robot
4fdafe37f3 Merge "Revert "Remove all ZIP64LIMIT hack"" am: 7b640806da am: 78667a4692 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535093

Change-Id: I2b4cdec89bc9f5ccfc423dd93bef393902a612f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 02:41:44 +00:00
Dennis Song
2e63bdb6d0 Merge "Include META/* in the vendor item list when rebuild-sepolicy" am: 5da012adb0 am: e890d0008c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535541

Change-Id: I8600fd1e1a057eb53cc803f29620c7e46c329e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 02:41:26 +00:00
Treehugger Robot
7b640806da Merge "Revert "Remove all ZIP64LIMIT hack"" 2023-04-15 01:48:58 +00:00
Dennis Song
5da012adb0 Merge "Include META/* in the vendor item list when rebuild-sepolicy" 2023-04-15 01:15:44 +00:00
Treehugger Robot
581124e202 Merge "Order entries in apex_info.pb" am: 6fb4c8dcee am: f4c40a7eb2 am: 1b07bfec46 am: 3bc1d4b99b am: fd7a3e44af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083

Change-Id: I398575bfbed8adfb30b3e26497b7a0d53a936297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 23:03:14 +00:00
David Anderson
1c59617820 ota_from_target_files: Disable XOR on <T vendor. 
Bug: N/A
Test: ota_from_target_files
Change-Id: Ia9093a3c3f79d88f98f0777e8a0f8c72741055b8
 2023-04-14 16:01:55 -07:00
Kelvin Zhang
f92f7f046a Revert "Remove all ZIP64LIMIT hack" 
This reverts commit 37a4290909.

Reason for revert: b/278156419

Change-Id: I67ea667619a9623be849d911993010ef0f0bfd88
 2023-04-14 21:32:54 +00:00
Treehugger Robot
1b07bfec46 Merge "Order entries in apex_info.pb" am: 6fb4c8dcee am: f4c40a7eb2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2536083

Change-Id: Ia8830c6718644b7239c8b0be629b5bba5518597f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 21:23:19 +00:00
Håkan Kvist
01e381954b Order entries in apex_info.pb 
Adding the entries in apex_info.pb in sorted order makes it easier to
compare ota packages generated between the same source and target on
different computers/environments, ideally the generated ota zips should
be identical.

os.listdir() was used to find the apex files which should be
included in apex_info.pb. listdir() does not guarantee any order,
solution is to sort the result to ensure consistent order.

Bug: 278095305
Test: Manual. Confirm that apex_info.pb is generated sorted
    protoc --decode_raw < apex_info.pb
Change-Id: I2851d207f828a6ac31e63e20c9025965ac4b0eba
 2023-04-14 10:36:04 +02:00
Dennis Song
09f5c5dc0b Include META/* in the vendor item list when rebuild-sepolicy 
To ensure that `AddImagesToTargetFiles` can still be used with
vendor item list that do not specify all of the required META/
files, those files should be included by default.

Test: atest --host releasetools_test
Bug: 278133178
Change-Id: I5a04bfc43d405d6838028f2535ced2124dbd43aa
 2023-04-14 12:13:42 +08:00
zhangyongpeng
707569711b Try with search_path for some avb path args 
If we can't find relative signing_helper path, try with the OPTIONS.search_path dir prefix， and integrate the avb_*_key_path for the same logic.

Test: Build && releasetools_test

Signed-off-by: zhangyongpeng <zhangyongpeng@xiaomi.com>
Change-Id: Ifb1096ddea90693668f3344eb242bf9725113d11
 2023-04-14 12:12:47 +08:00
Treehugger Robot
985cf8f0af Merge "Fix s to t OTA" am: 64bfc41359 am: c4e1d12853 am: 858e08e0ca am: 0cf2a44eea am: 15b7b12769 
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966

Change-Id: Ie47f8311adacc356e52e1efa3faeda44b7f35cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:26:26 +00:00
Treehugger Robot
858e08e0ca Merge "Fix s to t OTA" am: 64bfc41359 am: c4e1d12853 
Original change: https://android-review.googlesource.com/c/platform/build/+/2531966

Change-Id: Ia20bdef8a788e1a4fbb8facf047c2bf211bd8495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 01:46:13 +00:00
Kelvin Zhang
cb4b6037c4 Merge "Fix releasetools timeouts" am: 010bbea401 am: d434bd4c02 am: 6c5f1c32a3 am: 3d9c132545 am: 28052f3f17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2530977

Change-Id: I9e5949dc9e1bb0c65f2b5e010ce1c02cda04d0d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 18:29:49 +00:00
Kelvin Zhang
6c5f1c32a3 Merge "Fix releasetools timeouts" am: 010bbea401 am: d434bd4c02 
Original change: https://android-review.googlesource.com/c/platform/build/+/2530977

Change-Id: I6c8c2360e17434139d2f0beffe5c0af807e9595d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 16:39:03 +00:00
Treehugger Robot
2880b7d93a Merge "Invoke delta_generator directly" am: 84031f7b49 am: 651e2a94c5 am: 766eaa6d78 am: 3bb997b956 am: 7ef96780ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529019

Change-Id: I25764c8d6a5c4664af36d606b2bae78cc281749b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 04:47:24 +00:00
Kelvin Zhang
629bc8dc1c Fix s to t OTA 
Android S update_engine has a smaller minor version, we should use
update_engine version number from source build when generating an
incremental OTA.

Test: th
Bug: 277837157
Change-Id: Ic1ccdccd26c19bf9fb13d146a9151e699e481201
 2023-04-11 21:30:42 -07:00