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
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 908e3504d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22555017
Change-Id: I94acbaf75b5d246232320d8b646239eaeb64fde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I4b2ea3956c34aa56cc6f54bab7148f116c34759e with SHA-1 908e3504d8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22555017
Change-Id: I20d9887872d6403db654c1f857860baf88186880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I0ff1528cf4c79c9604db6302d9a3470e81aae7ee with SHA-1 8e7f862bce is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22562087
Change-Id: I79314614e1652cc1f19232a7bfe4ff2ab7e26a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I0ff1528cf4c79c9604db6302d9a3470e81aae7ee with SHA-1 8e7f862bce is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22562087
Change-Id: I2b54087013130a0ddc43ade8a717a7f96d8d9a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This reverts commit fd358ae340.
Reason for revert: fixed the issues in aosp/2529028 and aosp/2524438.
Change-Id: Ieb4e6189a9357dafe81f15c72d5603166d9caa4d
Release tools test uses sleep(5) to make sure mtime on files change in a
visible way. Use hardcoded mtime instead of sleeps.
Improvement: 145.6s -> 65s
Test: atest releasetools_test
Bug: 277782284
Fixes: 277782284
Change-Id: I4d7b04707f3b6c5843cde883f43e95a1e7a69879
Currently, ota_from_target_files(a python script) calls
brillo_update_payload(a bash script), which then calls delta_generator(a
C++ binary) to do the actual diffing. Having brillo_update_payload in
the middle does not offer any additional flexibility, but it makes
maintaince more difficult. Bash code is less readable and harder to
debug. Further more, everytime we want to add a new flag to
delta_generator, we have to add the flag in three places:
ota_from_target_files, brillo_update_payload, delta_generator.
Historically, brillo_update_payload was there because we inherited from
ChromeOS side. This bash scripts extracts target_files.zip and invoke
delta_generator to generate the actual OTA. Any customizations we want
on OTA must be implemented by modifying the input target_files.zip ,
Manipuating big zip files is slow and inefficient.
To make thing simpler/faster, remove the intermdiary call to
brill_update_payload. ota_from_target_files will now extract target
files and call delta_generator directly.
Test: th
Bug: 227848550
Change-Id: I44b296e43bf7921bcf48ef6a1e4021a12669739c
- add a mode to disable finalization steps if they were already merged,
- add the extension version into commit message.
Bug: 243966946
Test: local run
Change-Id: I51505e5d5715b56f3b385d714e1aabaae06f58ed
am skip reason: Merged-In Ie0234187fd4689211f0d4530f9b96027567273ad with SHA-1 6a4773340a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22514523
Change-Id: Ide139364799bc23085f57bae55d4bdc75f97e428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Iace22e384976663a8b6e4d1c474c1e2d0f90ec74 with SHA-1 6715e76360 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22514522
Change-Id: I51f7b4dbec42a890dc3e5e6b582be614cb78134e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I31fed64619e26a1c690a6cf086c644757e45a878 with SHA-1 fd5e673f9f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22513081
Change-Id: I063caa8ad7234cff47e1c02a4aaa19496c9cb64f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Expand `merge_target_files.py` API capabilities so that
`--framework-target-files` and `--vendor-target-files`
can be either zip archives or directories.
Test: Create a merged package by vendor target files folder
Test: atest --host releasetools_test
Bug: 276068400
Change-Id: I200be2a458ae59a61e05bfd7c78ab66093db32eb
At the dev stage, devices may set ro.board.(first_)api_level to the
future API level
Bug: 276927022
Test: test_post_process_props.py
Change-Id: I85c29af74ed8daa780278f64b023480bb6659781
