Commit Graph

60740 Commits

Author SHA1 Message Date
Treehugger Robot cbee0b0284 Merge "Delete deps-license target." am: 95fc5e76a6 am: 381b86da62
Change-Id: I1e87c23a257e10db0618c03ae962bba753123cae
2020-05-21 22:15:53 +00:00
Treehugger Robot 381b86da62 Merge "Delete deps-license target." am: 95fc5e76a6
Change-Id: If7cd6f4365894902e925a0a79fb67eb2a35f435b
2020-05-21 21:51:40 +00:00
Treehugger Robot 95fc5e76a6 Merge "Delete deps-license target." 2020-05-21 21:37:06 +00:00
Tianjie Xu 7790069449 Merge "Add an option to input the boot variables for OTA package generation" am: 1ca7b10456 am: 0dbde58c9b
Change-Id: I27286dd6a6eae839231bacd508d9a014b9f8a32a
2020-05-21 18:27:34 +00:00
Tianjie Xu 0dbde58c9b Merge "Add an option to input the boot variables for OTA package generation" am: 1ca7b10456
Change-Id: I33bbd3bb27fcba8f6a40e7c79b78c6751a7fc817
2020-05-21 18:13:36 +00:00
Tianjie Xu 1ca7b10456 Merge "Add an option to input the boot variables for OTA package generation" 2020-05-21 17:58:21 +00:00
Treehugger Robot 9e55d3d282 Merge "Add options to sign the prebuilt custom images." am: 8a87dae43b am: 1c23d3ce54
Change-Id: Ife592f30393e0411cb9ca94a34409aa9f111e8ec
2020-05-21 17:10:36 +00:00
Treehugger Robot 1c23d3ce54 Merge "Add options to sign the prebuilt custom images." am: 8a87dae43b
Change-Id: Ib7e979796c6646085ba526f9fe4cafaaface4a5f
2020-05-21 16:51:06 +00:00
Treehugger Robot 8a87dae43b Merge "Add options to sign the prebuilt custom images." 2020-05-21 16:34:13 +00:00
Bob Badour 2441181bdf Delete deps-license target.
If used, the results would be inaccurate in any case.

Deleted atest references: http://aosp/1315404 http://aosp/1315405

Test: treehugger
Test: atest -c --rebuild-module-info com.google.android.gts.updateengine.UpdateEngineHostTest

Change-Id: I6efbf1f5ff3a533b26d6bbedc14a6fcc1b200391
2020-05-21 07:11:55 -07:00
Anton Hansson 698444848b Merge "Revert "Minor cleanup for script consistency and adherence to Google shell style guide."" am: 438fc22219 am: 2f0c4e42b0
Change-Id: Ie69f1829d60700cf4e6b06eb2bb65245c1932eb1
2020-05-21 11:35:06 +00:00
Anton Hansson 2f0c4e42b0 Merge "Revert "Minor cleanup for script consistency and adherence to Google shell style guide."" am: 438fc22219
Change-Id: Id48a0b1521deb4acfe0f95ff5a74a302b98ca923
2020-05-21 11:15:42 +00:00
Anton Hansson 438fc22219 Merge "Revert "Minor cleanup for script consistency and adherence to Google shell style guide."" 2020-05-21 10:50:57 +00:00
Matt Alexander d9c56568de Revert "Minor cleanup for script consistency and adherence to Google shell style guide."
This reverts commit d92718356d.

Reason for revert: Adding the opening brace to the end of the function breaks lunch.  

Change-Id: Ia3a9ff01964de0e616a534058d568150de32558a
2020-05-21 10:49:17 +00:00
Daniel Rosenberg 0845c81633 Merge "Disable sdcardfs from emulated_stroage.mk" into rvc-dev am: 241877809f
Change-Id: I3a03c65cbaa20aee21cb87823a77f1d1f8e40ebf
2020-05-21 08:41:14 +00:00
Daniel Rosenberg 241877809f Merge "Disable sdcardfs from emulated_stroage.mk" into rvc-dev 2020-05-21 08:31:22 +00:00
Tianjie d6867167d1 Add an option to input the boot variables for OTA package generation
The values of the ro.boot* variables are not part of the image files
and are provided (e.g. by bootloaders) at runtime. Meanwhile, their
values may affect some of the device build properties, as a different
build.prop file can be imported by init during runtime.

This cl adds an option to accepts a list of possible values for some
boot variables. The OTA generation script later use these values to
calculate the alternative runtime fingerprints of the device; and
list the device names and fingerprints in the OTA package's metadata.

The OTA metadata is verified by the OTA server or recovery to ensure
the correct OTA package is used for update. We haven't made any
restrictions on what ro.boot* variables can be used for fingerprint
override. One possible candidate can be the skus listed in
ODM_MANIFEST_SKUS.

Bug: 152167826
Test: unittests pass, generate an OTA file with the new option
Change-Id: I637dea3472354236d2fd1ef0a3306712b3283c29
2020-05-20 19:01:17 -07:00
Treehugger Robot 5b79a329f1 Merge "sign_apex.py respects hash algorithm" am: ed67178e4a am: ef5e5708a9
Change-Id: Icd7e7c1a8612e47da115b7341aec95d9ccf2201d
2020-05-21 01:11:18 +00:00
Treehugger Robot ef5e5708a9 Merge "sign_apex.py respects hash algorithm" am: ed67178e4a
Change-Id: I74d30318a703979c42927337240b2158f7b792fa
2020-05-21 00:46:00 +00:00
Treehugger Robot ed67178e4a Merge "sign_apex.py respects hash algorithm" 2020-05-21 00:35:54 +00:00
Treehugger Robot 567f209484 Merge "Minor cleanup for script consistency and adherence to Google shell style guide." am: 513bce3b4e am: 6765fe9353
Change-Id: I3b8d0fc6be6ac098172828e8f8165ed25c74e241
2020-05-20 23:22:25 +00:00
Treehugger Robot 6765fe9353 Merge "Minor cleanup for script consistency and adherence to Google shell style guide." am: 513bce3b4e
Change-Id: If93bac624777497001744dc54ade70724a589883
2020-05-20 22:59:44 +00:00
Treehugger Robot 513bce3b4e Merge "Minor cleanup for script consistency and adherence to Google shell style guide." 2020-05-20 22:37:00 +00:00
TreeHugger Robot 37dd13f601 Merge "Update Security String to 2020-07-05" into qt-qpr1-dev am: e549d10438 am: d078cc9f78
Change-Id: If5070079266851b863efb93dafb36f5d74286e7e
2020-05-20 22:16:16 +00:00
TreeHugger Robot d078cc9f78 Merge "Update Security String to 2020-07-05" into qt-qpr1-dev am: e549d10438
Change-Id: If51535409877a076bbc636753cc0e357fea2520e
2020-05-20 22:05:03 +00:00
TreeHugger Robot e549d10438 Merge "Update Security String to 2020-07-05" into qt-qpr1-dev 2020-05-20 21:47:09 +00:00
Treehugger Robot 2cea0f5f40 [automerger skipped] Merge "Do not fail if unzip found no files to extract" am: 0ead402c40 am: 97e1277e81 -s ours
am skip reason: Change-Id Ib84c9fa1ceb45542ebcee14e048ecf2c1783c0c0 with SHA-1 5761b525de is in history

Change-Id: I9166e86a9caf1fcecce1859b45dddcd62e8b0c16
2020-05-20 20:47:12 +00:00
Treehugger Robot 97e1277e81 Merge "Do not fail if unzip found no files to extract" am: 0ead402c40
Change-Id: I65409b22fbd97c816502181feb17d0f1f3e3c282
2020-05-20 20:32:43 +00:00
Treehugger Robot 0ead402c40 Merge "Do not fail if unzip found no files to extract" 2020-05-20 20:18:04 +00:00
Matt Alexander d92718356d Minor cleanup for script consistency and adherence to Google shell style guide.
Test: manual

Change-Id: Ie9fd197cee5e934a0b89898b85d1a97adcec6348
2020-05-20 19:21:38 +00:00
TreeHugger Robot ddba33a15d Merge "Do not fail if unzip found no files to extract" into rvc-dev am: df865a9a17
Change-Id: Ia09a98fddef9c6e37922a1d112aa2a9881ff47c4
2020-05-20 17:37:24 +00:00
TreeHugger Robot df865a9a17 Merge "Do not fail if unzip found no files to extract" into rvc-dev 2020-05-20 17:15:16 +00:00
Julien Desprez 3d006cecfc Merge "Add tradefed-test-framework to the suites exported jar" am: f244a36850 am: f39239b3f7
Change-Id: If6ebf8b08e56ee7506ba129dc472531e50e365e8
2020-05-20 17:12:36 +00:00
Julien Desprez f39239b3f7 Merge "Add tradefed-test-framework to the suites exported jar" am: f244a36850
Change-Id: I072dfcfac0dc5f97047f21dd1aa29ab390fa2b78
2020-05-20 17:00:13 +00:00
Julien Desprez f244a36850 Merge "Add tradefed-test-framework to the suites exported jar" 2020-05-20 16:46:22 +00:00
Treehugger Robot 037160499e [automerger skipped] Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" am: 0e19b74112 am: f7d89045d4 -s ours
am skip reason: Change-Id I8c4c7c9b2982daf6bf02991b4e62a43b296d003e with SHA-1 de9dc88b59 is in history

Change-Id: I65dde426b8c119c5908f996bb2094592580fc72a
2020-05-20 14:10:09 +00:00
Treehugger Robot f7d89045d4 Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" am: 0e19b74112
Change-Id: I3e47d1e371a8a0291ff003b6d03382b6b8f8aae5
2020-05-20 13:54:42 +00:00
Treehugger Robot 0e19b74112 Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" 2020-05-20 13:32:24 +00:00
Yo Chiang 7644587bcc Merge "Resolve module bitness for PRODUCT_PACKAGES" am: 7c147f7e29 am: b5e015fa9e
Change-Id: If01ecd77e857d826f085cdcab18dd1c4c7506ff2
2020-05-20 05:38:34 +00:00
Yo Chiang b5e015fa9e Merge "Resolve module bitness for PRODUCT_PACKAGES" am: 7c147f7e29
Change-Id: I74a2a50ddf83df66f8f373d724d8417be8e44e45
2020-05-20 05:24:20 +00:00
Sasha Smundak 262491b0a8 Do not fail if unzip found no files to extract
Fixes: 157081961
Test: manual
Change-Id: Ib84c9fa1ceb45542ebcee14e048ecf2c1783c0c0
Merged-In: Ib84c9fa1ceb45542ebcee14e048ecf2c1783c0c0
2020-05-20 04:58:01 +00:00
Sasha Smundak 5761b525de Do not fail if unzip found no files to extract
Fixes: 157081961
Test: manual
Change-Id: Ib84c9fa1ceb45542ebcee14e048ecf2c1783c0c0
2020-05-20 04:56:05 +00:00
Yo Chiang 7c147f7e29 Merge "Resolve module bitness for PRODUCT_PACKAGES" 2020-05-20 04:55:22 +00:00
Daniel Rosenberg 32be864b0e Disable sdcardfs from emulated_stroage.mk
This sets external_storage.sdcardfs.enabled=0 from emulated_storage.mk,
which will disable sdcardfs on devices that are using casefolding and
quotas as sdcardfs replacements. This allows the device to use these if
sdcardfs is present in the kernel.

Bug: 155222498
Test: mount|grep "type sdcardfs" should find nothing after boot complete
      if external_storage.sdcardfs.enabled=0
Change-Id: Id0446a7cac5ac768afc3b3e046359fc4e945e554
2020-05-20 04:50:06 +00:00
Automerger Merge Worker 13d47c8dc6 Merge changes from topic "am-95716cb6521c4007b25e4c8f3c38c84b" into rvc-dev-plus-aosp
* changes:
  Merge changes I80341c2e,I0935f611,Ia805cb47 am: 3dbbfde296 am: 68e66200f2
  [automerger skipped] Add PLATFORM_VERSION_LAST_STABLE am: c969779a05 am: a5ab34f4a0 -s ours
2020-05-20 04:20:24 +00:00
Treehugger Robot 26a01be6bc Merge changes I80341c2e,I0935f611,Ia805cb47 am: 3dbbfde296 am: 68e66200f2
Change-Id: I0bd92a44d7507ef2f695a342878a37859b69fc82
2020-05-20 04:20:18 +00:00
Roland Levillain f7d81b9b40 [automerger skipped] Introduce build variable `OVERRIDE_TARGET_FLATTEN_APEX`. am: 1dbb0c3d1e -s ours am: 7f81fd1403 -s ours
am skip reason: Change-Id Ib9ccae38430340de38e4758b4f55df2c65ea60d5 with SHA-1 b3a503df7f is in history

Change-Id: Ideb874f25ca4bed64f2dd1a56c3755fadb3fb6f5
2020-05-20 04:20:17 +00:00
Jiyong Park 99edce0c1e [automerger skipped] Add PLATFORM_VERSION_LAST_STABLE am: c969779a05 am: a5ab34f4a0 -s ours
am skip reason: Change-Id Iaeefb35137de01c6ea57115d8830dd9bc30eccba with SHA-1 25648e60b2 is in history

Change-Id: Ia5ad458db73f8ba32a8b9fb95f71ced178850899
2020-05-20 04:20:16 +00:00
Hongguang Chen f23364d280 Add options to sign the prebuilt custom images.
The custom images are any images owned by OEMs and SoCs, oem images
mounted on /oem is an example. The oem images can be used to customize
devices for different carriers, like wallpaper, ringtones, and
carrier-specific apks. OEMs can generate multiple oem images, like
oem.img, oem-carrier1.img and oem-carrier2.img and flash different oem
images for different carriers. The oem images are only one case, OEMs
and SoCs can add more custom images and mount them to custom partitions.

This change enables custom images to be vbmeta.img chained partitions.
The following configuration in BoardConfig.mk is an exmaple. It has two
custom partitions: oem and test. They will be signed by different keys.
And they will be chained by vbmeta.img. The custom images here are
prebuilts, which can be built by `make custom_images` separately.
BOARD_AVB_<CUSTOM_PARTITION>_IMAGE_LIST should include all custom images
to apply AVB signing. And to every custom partition, one image whose
name is partition name must be added in its
BOARD_AVB_<CUSTOM_PARTITION>_IMAGE_LIST.

BOARD_CUSTOMIMAGES_PARTITION_LIST := oem test

BOARD_AVB_OEM_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
BOARD_AVB_OEM_ALGORITHM := SHA256_RSA4096
BOARD_AVB_OEM_ADD_HASHTREE_FOOTER_ARGS :=
BOARD_AVB_OEM_ROLLBACK_INDEX_LOCATION := 1
BOARD_AVB_OEM_PARTITION_SIZE := 5242880
BOARD_AVB_OEM_IMAGE_LIST := \
    device/xxxx/yyyy/oem/oem.img \
    device/xxxx/yyyy/oem/oem1.img

BOARD_AVB_TEST_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
BOARD_AVB_TEST_ALGORITHM := SHA256_RSA2048
BOARD_AVB_TEST_ADD_HASHTREE_FOOTER_ARGS :=
BOARD_AVB_TEST_ROLLBACK_INDEX_LOCATION := 2
BOARD_AVB_TEST_PARTITION_SIZE := 10485760
BOARD_AVB_TEST_IMAGE_LIST := \
    device/xxxx/yyyy/test/test.img \
    device/xxxx/yyyy/test/test1.img

To resign the custom images in the target zip file, the
avb_extra_custom_image_key, avb_extra_custom_image_algorithms and
avb_extra_custom_image_extra_args options are added to the
sign_target_files_apks tool too. The following test cases list some
examples about how to use them.

BUG: 154171021
Test: 1) "atest --host releasetools_test releasetools_py3_test -c"
  2) Build images by 'make dist', sign and validate target files.
   a) Test on dist w/ chained vbmeta_system and ome custom images
   sign_target_files_apks -d certs \
     --avb_extra_custom_image_key oem=oem_rsa4096.pem \
     --avb_extra_custom_image_algorithm oem=SHA256_RSA4096 \
     xxx-target_xxx.zip signed.zip
   validate_target_files.py signed.zip
   Flash image and boot up.
   Verify the oem images and vbmeta images in OUT and target zips by
   avbtool.

   b) Test on dist w/ chained vbmeta_system and oem and test custom images
   sign_target_files_apks -d certs \
     --avb_extra_custom_image_key oem=oem_rsa4096.pem \
     --avb_extra_custom_image_algorithm oem=SHA256_RSA4096 \
     --avb_extra_custom_image_extra_args oem=--do_not_generate_fec \
     --avb_extra_custom_image_key test=test_rsa4096.pem \
     --avb_extra_custom_image_algorithm test=SHA256_RSA4096 \
     xxx-target_xxx.zip signed.zip
   validate_target_files.py signed.zip
   Verify the oem, test images and vbmeta images in OUT and target zips
   by avbtool.

   c) Test on dist w/o chained partition.
   sign_target_files_apks -d certs xxx-target_xxx.zip signed.zip
   validate_target_files.py signed.zip
   Flash image and boot up.
   Verify the vbmeta images in OUT and target zips by avbtool.

Change-Id: Ifccfee5e8909697eef6ccda0cc352fa16a9f6db6
2020-05-20 04:10:00 +00:00
Treehugger Robot 68e66200f2 Merge changes I80341c2e,I0935f611,Ia805cb47 am: 3dbbfde296
Change-Id: Id8e59bc9dbc6527023adbb1e2bc79b710a61c804
2020-05-20 04:04:11 +00:00