Commit graph

60830 commits

Author SHA1 Message Date
Remi NGUYEN VAN
5016b84b00 Merge "Use NetworkStack on system image" into rvc-dev 2020-05-20 00:52:47 +00:00
Treehugger Robot
b5ee0f0b57 Merge changes from topic "nonab_pkg"
* changes:
  Use add_slot_suffix function in edify script
  Support forcefully generating non-AB packages.
2020-05-20 00:30:31 +00:00
TreeHugger Robot
9817fa2953 Merge "Fix the syntax in install-recovery.sh" into rvc-dev am: 581a943336
Change-Id: I00241508e40d7c3fb50d2bff6da376131d805682
2020-05-19 22:44:42 +00:00
TreeHugger Robot
581a943336 Merge "Fix the syntax in install-recovery.sh" into rvc-dev 2020-05-19 22:44:39 +00:00
Dan Shi
5dac983f9c [automerger skipped] Merge "Revert "Add vts related artifacts to vts-core package"" into rvc-dev am: e47836b0c6 -s ours
am skip reason: Change-Id I8245f1b7a4a74e133c0b7958e0f2908e4e8efd05 with SHA-1 c4fa187094 is in history

Change-Id: I83d8adc9fdc0d2e4c7d16eab8105f9fb942069e8
2020-05-19 22:44:16 +00: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
Yifan Hong
bdb3201353 Use add_slot_suffix function in edify script
Whenever a device is retrieved from fstab, wrap it with
add_slot_suffix() if it has slotselect option.

Test: change fstab (changes boot image, which is a static partition),
      change system partition (a dynamic partition),
      generate incremental OTA with --force_non_ab and apply it on
      cuttlefish
Bug: 153581609
Change-Id: Id3f8e4425b65176baf1b0ff1ee07ab3d820a3a7f
(cherry picked from commit ae6e0d5d28)
Merged-In: Id3f8e4425b65176baf1b0ff1ee07ab3d820a3a7f
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
Tianjie
e55f62c971 Fix the syntax in install-recovery.sh
We recently modify the logic in install-recovery.sh to support
non-A/B updates on VAB launched devices. And the position of the
$(getprop ro.boot.slot_suffix) is misplaced for the recovery image.
For example:
"if ! applypatch --check EMMC$(getprop ro.boot.slot_suffix):/dev/block/recovery:SHA1"
should be:
"if ! applypatch --check EMMC:/dev/block/recovery$(getprop ro.boot.slot_suffix):SHA1"

Bug: 156979431
Test: rerun add_image_to_target_file, then validate_target_files
Change-Id: Id2d45e281151a46d66b37ea8fdb7b5cb4ae72e81
2020-05-19 13:44:26 -07: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
Jiyong Park
a1887f326c sign_apex.py respects hash algorithm
When sign_apex.py re-signs an apex, the hash algorithm is extracted and
it is used when re-packaging the file.

Bug: 155771970
Test: releasetools_py3_test doesn't regress
(some tests were failed, but they failed even without this change:
test_ApexApkSigner_apkKeyNotPresent (test_apex_utils.ApexUtilsTest) ... ERROR
test_ApexApkSigner_noApkPresent (test_apex_utils.ApexUtilsTest) ... ERROR
test_ApexApkSigner_noAssetDir (test_apex_utils.ApexUtilsTest) ... ERROR
test_ApexApkSigner_signApk (test_apex_utils.ApexUtilsTest) ... ERROR)

Change-Id: I996a33e0208d3dd3a04a31b8dafb27ef995297f2
2020-05-19 23:19:59 +09:00
Remi NGUYEN VAN
5f2e395212 Use NetworkStack on system image
Now that NetworkStack was bumped to API 30, use NetworkStack instead of
NetworkStackNext on the system image.

This change should not be merged in branches that are used for building
S system images for internal testing. Note that the merged-in change
is not related to this change; it is just used to prevent this change
from merging into the aosp/master merge path.

Bug: 143586229
Test: m
Merged-In: Ibc74edb88904f953a1e5e6ceef44c461f381c9cf
Change-Id: I484e148fab80a01d2b20ebf48604d9e923fe7cd3
2020-05-19 09:56:57 +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
Treehugger Robot
c4730e4efa [automerger skipped] Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" am: 8074729bc2 am: 865b8b8989 -s ours
am skip reason: Change-Id I68b0f9bd22e50c2a86e0dbe62abc17991581703e with SHA-1 95de4601b9 is in history

Change-Id: I3d1ea466e05f44b1facc4332e7767aef7bd5ca9e
2020-05-18 21:40:07 +00:00
Treehugger Robot
865b8b8989 Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" am: 8074729bc2
Change-Id: Ia8275ccf8ca204af8191b3d0f6a38e1b93cc56c1
2020-05-18 21:27:46 +00:00
Treehugger Robot
8074729bc2 Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" 2020-05-18 21:17:52 +00:00
David Zeuthen
a911c7ced7 Update Identity Credential AIDL and Keymaster AIDL to V2 in VNDK list
Bug: 156076333
Bug: 154631410
Test: atest VtsHalIdentityTargetTest
Test: atest android.security.identity.cts
Change-Id: Iac45277dd49b43b92da91139de056d44ff1e041f
2020-05-18 16:55:50 -04: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
Roman Kiryanov
6e0c857fe2 Import the d/g/goldfish soong namespace for libwifi-hal-emu
Some devices refer to libwifi-hal-emu via

BOARD_WLAN_DEVICE := emulator

we need to import the device/generic/goldfish
namespace to link the libwifi-hal-emu symbol.

Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
Merged-In: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
2020-05-18 09:46:25 -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
SzuWei Lin
6b26f52cf7 Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk
BOARD_EXT4_SHARE_DUP_BLOCKS can reduce the image size. Move it to
BoardConfigMainlineCommon.mk to apply on all mainline based
targets.

Bug: 155589918
Test: build aosp_arm-userdebug
Test: build gsi_gms_arm64-userdebug
Test: build sdk_gphone_arm64-userdebug
Change-Id: I8c4c7c9b2982daf6bf02991b4e62a43b296d003e
Merged-In: I8c4c7c9b2982daf6bf02991b4e62a43b296d003e
(cherry picked from commit de9dc88b59)
2020-05-18 15:37:44 +08:00
TreeHugger Robot
cb1a26ac0b [automerger skipped] Merge "Enables signing for generic boot images" into rvc-dev am: 2fc5a393e0 -s ours
am skip reason: Change-Id I2fd69964f9dc62526a813875fa9193913aa4935b with SHA-1 0f95ac7e8c is in history

Change-Id: Ieb8e48b1deceae6529793aae35bb1511d12ef922
2020-05-18 05:56:30 +00:00
TreeHugger Robot
2fc5a393e0 Merge "Enables signing for generic boot images" into rvc-dev 2020-05-18 05:32:35 +00:00
TreeHugger Robot
dfbff3a4c6 Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" into rvc-dev am: 2cde78687d
Change-Id: Ib6c1a7a365012cf5f1ba96c40a2ebb869f08accb
2020-05-18 04:36:27 +00:00
TreeHugger Robot
2cde78687d Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" into rvc-dev 2020-05-18 04:16:41 +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
TreeHugger Robot
387689574a Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" into rvc-dev am: 9a004c6371
Change-Id: If0d84e352a57368cea59e51a3414ab131d3d90f7
2020-05-18 04:00:21 +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
TreeHugger Robot
9a004c6371 Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" into rvc-dev 2020-05-18 03:50:26 +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
0be49be8d8 [automerger skipped] Merge "DO NOT MERGE - Merge QQ3A.200605.002 into stage-aosp-master" into stage-aosp-master am: 0806a1fd2b -s ours
am skip reason: subject contains skip directive

Change-Id: I09512961967279045d7acd2516542e613d146f60
2020-05-17 23:57:14 +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