Commit Graph

24213 Commits

Author SHA1 Message Date
Yo Chiang
1db657a1ed Check module existence with ALL_MODULES subvars
Use ALL_MODULES.*.PATH to check module existence.
Use get-modules-for-2nd-arch to check the existence of second arch
variant.
Fix some typos *existant -> existent

Bug: 155869107
Test: lunch mainline_system_arm64; m
Test: lunch generic; m
Change-Id: Ic10fb34a11da0bfbfc528da7496fd929b1d77113
2020-05-20 16:02:07 +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
Treehugger Robot
26a01be6bc Merge changes I80341c2e,I0935f611,Ia805cb47 am: 3dbbfde296 am: 68e66200f2
Change-Id: I0bd92a44d7507ef2f695a342878a37859b69fc82
2020-05-20 04:20:18 +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
Jiyong Park
a5ab34f4a0 Add PLATFORM_VERSION_LAST_STABLE am: c969779a05
Change-Id: I31262e1db291c91b3d2ace0cd0c90272982662c5
2020-05-20 04:04:08 +00:00
Treehugger Robot
3dbbfde296 Merge changes I80341c2e,I0935f611,Ia805cb47
* changes:
  Deprecate ADDITIONAL_DEFAULT_PROPERTIES
  Move most of the sysprop generation rules to sysprop.mk
  Add PLATFORM_VERSION_LAST_STABLE
2020-05-20 03:49:26 +00:00
TreeHugger Robot
27e8474d57 Merge "support different boot partition sizes in aosp_arm64" into rvc-dev 2020-05-20 03:26:56 +00:00
Bob Badour
1f6b2cf0d8 Merge "Revert "Delete deps-license target."" am: fe1328755d am: c052816a75
Change-Id: I500aba28c05bd75323c40eff339fd10ca6585dba
2020-05-20 02:57:40 +00:00
Bob Badour
c052816a75 Merge "Revert "Delete deps-license target."" am: fe1328755d
Change-Id: I646dcc7d6d407926e34e6691550da1841f0dbcc7
2020-05-20 02:44:42 +00:00
Bob Badour
fe1328755d Merge "Revert "Delete deps-license target."" 2020-05-20 02:16:06 +00:00
Bob Badour
233336e8a8 Revert "Delete deps-license target."
This reverts commit a553cc828e.

Reason for revert: atest has code that tries to build the target

Change-Id: I46902b3930a5a73aa3e5a15f29e0bb0246e59250
2020-05-20 02:14:04 +00:00
Yifan Hong
2e12b29cd3 Support forcefully generating non-AB packages. am: 65afc07f9d
Change-Id: I0a9d871701505bf32e4a6df2f4cab83000fc4d32
2020-05-20 00:55:00 +00:00
Dan Shi
eac6ed644c Remove vts10 dependencies
Bug: 149249068
Test: build
Change-Id: I56119259add1435215958b51a58bc1b971f27067
2020-05-19 15:32:25 -07:00
Dan Shi
e47836b0c6 Merge "Revert "Add vts related artifacts to vts-core package"" into rvc-dev 2020-05-19 22:25:44 +00:00
Yifan Hong
65afc07f9d Support forcefully generating non-AB packages.
Force generate a non-A/B update package when requested.

Bug: 154344887
Test: ota_from_target_files.py --force_non_ab ...
Test: apply it as well

Change-Id: I5e81eb161722e07ef50081b6a16685cbc9963ae2
(cherry picked from commit 7169f754cc)
Merged-In: I5e81eb161722e07ef50081b6a16685cbc9963ae2
2020-05-19 15:23:27 -07:00
Treehugger Robot
c7d65744c4 Merge "support different boot partition sizes in aosp_arm64" am: def74b4c2b am: 3bfb87b96b
Change-Id: Iff0c4a70c7a3ed43d2f96a72a0dd16c4301386f0
2020-05-19 22:02:28 +00:00
Treehugger Robot
3bfb87b96b Merge "support different boot partition sizes in aosp_arm64" am: def74b4c2b
Change-Id: Ifb89214358958ab0c2f407b98cef676c78ad2f21
2020-05-19 21:41:08 +00:00
Steve Muckle
53226684b9 support different boot partition sizes in aosp_arm64
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.

This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.

A previous version of this change did not update the boot-debug image
AVB logic with the required macro for multiple boot partition size
support. This is now required because the aosp-arm64 boot.img is
configured as a chained AVB partition.

Bug: 156036850
Bug: 155049180
Change-Id: I66b57de91042bfd56ba54a3659843d8cf7873955
Merged-In: I66b57de91042bfd56ba54a3659843d8cf7873955
2020-05-19 14:37:40 -07:00
Treehugger Robot
def74b4c2b Merge "support different boot partition sizes in aosp_arm64" 2020-05-19 21:30:07 +00:00
Dan Shi
a1082fb046 Revert "Add vts related artifacts to vts-core package"
This reverts commit 5e06288e7c.

Bug: 149249068
Test: build

Change-Id: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
Merged-In: I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05
2020-05-19 13:24:59 -07:00
Treehugger Robot
3264459841 Merge "Delete deps-license target." am: c2c427f6bb am: 724ea1f3b4
Change-Id: Ib774278b4818b0b9d0c9856b675cbb24c552b8aa
2020-05-19 18:25:10 +00:00
Treehugger Robot
724ea1f3b4 Merge "Delete deps-license target." am: c2c427f6bb
Change-Id: I0074c6b81e9ebf2221325b1fbacb0057a75bb742
2020-05-19 18:10:24 +00:00
Treehugger Robot
c2c427f6bb Merge "Delete deps-license target." 2020-05-19 17:56:53 +00:00
Yo Chiang
06d81cc30a Merge "Refactor bitness resolving logic of product-installed-files" am: 502606f8ce am: 395e91dba5
Change-Id: Ia2b98f97cf06b7c0854e9f0aebd8c6389297b84e
2020-05-19 03:46:15 +00:00
Yo Chiang
395e91dba5 Merge "Refactor bitness resolving logic of product-installed-files" am: 502606f8ce
Change-Id: Idfaf7c79f08b1dbd2f64122b91ff7d44d862f1f1
2020-05-19 03:28:28 +00:00
Yo Chiang
502606f8ce Merge "Refactor bitness resolving logic of product-installed-files" 2020-05-19 03:17:29 +00:00
Roland Levillain
1dbb0c3d1e Introduce build variable OVERRIDE_TARGET_FLATTEN_APEX.
When `OVERRIDE_TARGET_FLATTEN_APEX` is defined (e.g. set in the
environment), `TARGET_FLATTEN_APEX` is forcibly assigned its value.

This is useful to enable/disable APEX flattening from the command
line (thus ignoring the product's default configuration), for testing
purposes.

Note: Previously it was possible to set `TARGET_FLATTEN_APEX` directly
and have the same effect, but recent changes in the build
configuration now prevent that option.

Test: Check that:
        export OVERRIDE_TARGET_FLATTEN_APEX=true \
          && . ./build/envsetup.sh \
          && lunch aosp_walleye-userdebug \
          && export OVERRIDE_TARGET_FLATTEN_APEX=true \
          && build/soong/soong_ui.bash --dumpvar-mode TARGET_FLATTEN_APEX
      returns:
        true
Bug: 121117762

Merged-In: Ib9ccae38430340de38e4758b4f55df2c65ea60d5
Change-Id: Ib9ccae38430340de38e4758b4f55df2c65ea60d5
(cherry picked from commit b3a503df7f)
2020-05-19 02:06:45 +00:00
Bob Badour
a553cc828e Delete deps-license target.
If used, the results would be inaccurate in any case.

Test: treehugger

Change-Id: I3fdd76bf7d97f6a9f40bccbf437986e5bb7e9e88
2020-05-18 16:50:47 -07:00
Julien Desprez
fae54cbd8a Add tradefed-test-framework to the suites exported jar
New jar that needs to be packaged for suites.

Test: make cts
Bug: 149758913
Change-Id: If29508f3dd30939be603ed03f2536c960ca40d92
2020-05-18 13:30:29 -07:00
Jiyong Park
80f164c0b3 Deprecate ADDITIONAL_DEFAULT_PROPERTIES
As we merge default.prop into build.prop, we don't need to distinguish
ADDITIONAL_DEFAULT_PROPERTIES and ADDITIONAL_BUILD_PROPERTIES. Deprecate
the former in favor of the latter.

Bug: 117892318
Test: m
Change-Id: I80341c2e05d70821396202dc9e94104625ebf024
2020-05-18 21:44:52 +09:00
Jiyong Park
e134686bca Move most of the sysprop generation rules to sysprop.mk
There is no change in functionality. This change just changes the
location of the code.

Bug: 117892318
Test: m
Change-Id: I0935f611069aeae867edefe8ca61bddb2aae4c78
2020-05-18 17:00:57 +09:00
Jiyong Park
c969779a05 Add PLATFORM_VERSION_LAST_STABLE
This is a partial cherry-pick of Iaeefb35137de01c6ea57115d8830dd9bc30eccba
to prevent merge conflicts that are expected with the upcoming major
refactoring around sysprops.

The addition of the variable here doesn't cause any side effect because
it is simply ignored by the buildinfo.sh tool.

Bug: 117892318
Test: m
Change-Id: Ia805cb47ae07c40e91ede16bb6e5c4291de619b4
Merged-In: Iaeefb35137de01c6ea57115d8830dd9bc30eccba
2020-05-18 16:54:42 +09:00
TreeHugger Robot
2fc5a393e0 Merge "Enables signing for generic boot images" into rvc-dev 2020-05-18 05:32:35 +00:00
Yo Chiang
bcd45cf3bb Merge "Access ALL_MODULES subvars with my_register_name" am: ca6e50fa2c am: a16d39fe25
Change-Id: Iea4d6198e40cd500bf548e20f1aee8239c269ade
2020-05-18 04:06:33 +00:00
Yo Chiang
a16d39fe25 Merge "Access ALL_MODULES subvars with my_register_name" am: ca6e50fa2c
Change-Id: I47ab83a327e70e41038a3c2ae1a2e2439306b300
2020-05-18 03:53:58 +00:00
Yo Chiang
ca6e50fa2c Merge "Access ALL_MODULES subvars with my_register_name" 2020-05-18 03:41:23 +00:00
Treehugger Robot
e18d90b28e Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" am: 203fd77042 am: b72fa3aaf6
Change-Id: I5ec86e149d8a5ec6dacc56afce1cfae81e714f5c
2020-05-18 02:28:33 +00:00
Treehugger Robot
b72fa3aaf6 Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" am: 203fd77042
Change-Id: I939b4d3da99d36b715160dd29fa12ebb45d426bd
2020-05-18 02:07:21 +00:00
easoncylee
88936626cf Update auto-gen test config template with PARAMETERIZED_STRINGS
placeholder

Bug: 134509111
Test: add "test_mainline_modules: [some.apk]" to TetheringTests,
and build the modules, confirm the parameterized option is added
in the test config.

Change-Id: I0f4f837412075520153d21c9ca12cf5c3f555de7
Merged-In: I0f4f837412075520153d21c9ca12cf5c3f555de7
2020-05-18 09:58:18 +08:00
Treehugger Robot
203fd77042 Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" 2020-05-18 01:50:49 +00:00
Xin Li
0806a1fd2b Merge "DO NOT MERGE - Merge QQ3A.200605.002 into stage-aosp-master" into stage-aosp-master 2020-05-17 23:44:01 +00:00
Paul Scovanner
902a6e18e0 Update Security String to 2020-07-05
Bug: 156652977
Change-Id: Ifee743bae79d21c096a95d608552fbb4260aff6c
2020-05-17 21:15:17 +00:00
Xin Li
62ebb9454e DO NOT MERGE - Merge QQ3A.200605.002 into stage-aosp-master
Bug: 155771477
Change-Id: Iea80d9cdc27c7109d848f9fc2350aecf5da75ece
Merged-In: I115a68d442f4f3922f0353fae1aae3bf1c057903
2020-05-16 17:30:34 +00:00
Treehugger Robot
b95ba0c9e4 Merge "Remove /default.prop" am: 3528db55f3 am: c7f65d7c5f
Change-Id: I9f603141ac5a9fa0b046eaabd60dc965c8f7bdfd
2020-05-16 09:11:34 +00:00
Treehugger Robot
3528db55f3 Merge "Remove /default.prop" 2020-05-16 08:39:56 +00:00