Commit Graph

49795 Commits

Author SHA1 Message Date
Colin Cross d4ada79abd Merge "Understand the support library/androidx @Keep annotations"
am: 3f6483cb0f

Change-Id: I4997b8d4aa6799eb262453b09c0549a509dcc012
2019-03-27 11:21:37 -07:00
Treehugger Robot 3f6483cb0f Merge "Understand the support library/androidx @Keep annotations" 2019-03-27 18:01:28 +00:00
Tao Bao ea673330bd Merge "releasetools: Remove the sanity check on APEX payload key names."
am: c292edc22c

Change-Id: I3ff4de4afde65971f9967db73a6373107517c8fa
2019-03-27 08:51:33 -07:00
Tao Bao c292edc22c Merge "releasetools: Remove the sanity check on APEX payload key names." 2019-03-27 15:44:29 +00:00
SzuWei Lin 969c3cd3ba Merge "Phase out all _a targets"
am: fde506a6d7

Change-Id: I6d3935cad6fabf8d3d963af501d936432e1f0c19
2019-03-27 06:07:12 -07:00
Treehugger Robot fde506a6d7 Merge "Phase out all _a targets" 2019-03-27 12:56:11 +00:00
SzuWei Lin b90ffb0f9a Phase out all _a targets
The _a targets are build for Legacy GSI for non-system-as-root
partition layout devices. The Android build system is not able
to build a system image with non-system-as-root anymore.
Also, `init` supports mounting system-as-root system image at
all, all devices should no problem to mount it.

Bug: 124278972
Test: none
Change-Id: I9c56e7e5d8517a630854f030616c3b3ecb94b9a8
2019-03-27 12:16:43 +08:00
Tao Bao 26b2664dce Merge "releasetools: Re-enable verifying AVB-signed images."
am: 5ed75d74e3

Change-Id: I45ff35f4b64967f5dd0c539b5abf535ab648408a
2019-03-26 20:36:22 -07:00
Tao Bao 5ed75d74e3 Merge "releasetools: Re-enable verifying AVB-signed images." 2019-03-27 03:20:13 +00:00
Colin Cross 38b48debc5 Understand the support library/androidx @Keep annotations
Copied from tools/base/build-system/gradle-core/src/main/resources/com/android/build/gradle/proguard-common.txt.

Fixes: 129311848
Test: none
Change-Id: Ie8b40b416c8772a550bb4d1f7bd6e7e944cdd166
2019-03-26 23:44:01 +00:00
Sasha Smundak aa2eb553d8 Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true"
am: d7060a50f9

Change-Id: Ice1a9ef05eadd59d45324c17a1c6e8f71f271828
2019-03-26 14:19:30 -07:00
Treehugger Robot d7060a50f9 Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" 2019-03-26 20:22:37 +00:00
Anton Hansson d3229a7179 Merge "Unset system-as-root for mainline"
am: 2f5e18362b

Change-Id: I6f189555966173e6e10543288c0f75bb839ffba4
2019-03-26 13:22:18 -07:00
Tao Bao 6d9e3da5f9 releasetools: Remove the sanity check on APEX payload key names.
Unlike container keys/certs, we'll always carry full names for APEX
payload signing keys.

Test: Run sign_target_files_apks.py on a target_files.zip with
      mismatching payload signing keys (e.g. shim apexes).
Test: `python -m unittest test_sign_target_files_apks`
Change-Id: Ifa329478f43b4f5ae665821564dbc14af7841330
2019-03-26 13:05:46 -07:00
Anton Hansson 2f5e18362b Merge "Unset system-as-root for mainline" 2019-03-26 19:34:13 +00:00
Tao Bao a81d429928 releasetools: Re-enable verifying AVB-signed images.
This reverts commit 9788b4ed31. All the
blocking issues have been addressed.

Fixes: 120517892
Test: Run validate_target_files.py on crosshatch signed
      target_files.zip.
Change-Id: I95de241e159998e002dedddafea65953b1a1b263
2019-03-26 12:13:37 -07:00
Anton Hansson fb69403773 Merge "Move EmergencyInfo to the /product hierarchy"
am: cd0997c1e9

Change-Id: Ie509b353b72b8e2730599bb6ef7f314bbf4f1112
2019-03-26 05:54:54 -07:00
Anton Hansson cd0997c1e9 Merge "Move EmergencyInfo to the /product hierarchy" 2019-03-26 12:39:09 +00:00
Orion Hodson b3c665b28b Merge "Add art-tools to host build outputs"
am: 484e82f7ca

Change-Id: Ib602b331061d6b4b33059ea08110af4e756a036b
2019-03-26 02:38:03 -07:00
Treehugger Robot 484e82f7ca Merge "Add art-tools to host build outputs" 2019-03-26 09:29:48 +00:00
Anton Hansson cd2f94407c Unset system-as-root for mainline
This flag is not allowed to be true when dynamic partitions are
enabled, which mainline devices are expected to do.

Bug: 80410283
Test: make
Change-Id: I50c9fe9332ea1490a84484f9311cfe001a083754
2019-03-26 09:22:07 +00:00
Daniel Norman 081eedce39 Merge "Merges dynamic partition misc_info.txt keys from both system and other."
am: c21a8448d1

Change-Id: I91afb67ab90b8a6f0c54138b299481403e4b1c2d
2019-03-25 16:26:53 -07:00
Daniel Norman 7100e93233 Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE."
am: b455273444

Change-Id: I7eb9f6686af9750e9960de66f954087f4551416f
2019-03-25 16:25:20 -07:00
Daniel Norman c21a8448d1 Merge "Merges dynamic partition misc_info.txt keys from both system and other." 2019-03-25 23:15:09 +00:00
Daniel Norman b455273444 Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE." 2019-03-25 23:15:01 +00:00
Sasha Smundak da25b691d3 Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true
Bug: 117224272
Test: treehugger
Change-Id: Idd47ead31fcd89dbf728f140dc3353e5013ba352
2019-03-25 13:26:03 -07:00
Anton Hansson 735aa9180e Move EmergencyInfo to the /product hierarchy
The app is moving to /product.

Bug: 122353713
Test: build_test
Change-Id: I78dc47963de21b8966fdfe15ce18695bf0747221
2019-03-25 19:52:06 +00:00
Daniel Norman adf8096c77 Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE.
The recovery patch gets put in the SYSTEM directory. Placing the
recovery patch here doesn't make sense when not building the system
image, as is the case for merged (system + vendor) builds.

Bug: 128838154
Test: Running make droid dist for a device target that sets PRODUCT_BUILD_SYSTEM_IMAGE to false.
Change-Id: Ib5ce8c8490024199f82d0c093e9a7ae2de5f71f5
2019-03-25 18:34:30 +00:00
Anton Hansson cc85e0377c Merge "Make mainline device enable property split"
am: 072795054a

Change-Id: Ib7539f1d076cc238917b3b82162419f9451aa0bd
2019-03-25 11:34:15 -07:00
Anton Hansson 072795054a Merge "Make mainline device enable property split" 2019-03-25 18:23:26 +00:00
Orion Hodson b099a10add Add art-tools to host build outputs
Building of host tools stopped when moving to APEX. This change
re-enables building of host tools.

Bug: 128990084
Test: m -j72 && find out -name 'oatdump'
Change-Id: Iad42b4e36561001709634174014192e56a64aafd
2019-03-25 13:36:59 +00:00
Anton Hansson 018bd137b7 Make mainline device enable property split
This setting moves the PRODUCT_PROPERTY_OVERRIDES to
the vendor partition.

Bug: 80410283
Test: tail system/build.prop | grep ro.carrier=
      (empty)

Change-Id: I30d564fbd2dd3b56763ccff77979b223857f1c2f
2019-03-25 10:53:07 +00:00
Anton Hansson fd946975d0 Merge "Put DEVICE/PRODUCT overlays in different partitions"
am: 94fa0e75cb

Change-Id: I490160177bd0084721212d832dff8c0d721e2e14
2019-03-25 02:32:55 -07:00
Anton Hansson 3632d053d0 Merge "Set file system types for mainline_arm64 partitions"
am: 9274688574

Change-Id: I8cd89bd4b7d5c1b5eb10cb2b270d5125e914e6fe
2019-03-25 02:32:00 -07:00
Anton Hansson 27ade4181f Merge "Make mainline_system_arm64 build only /system"
am: 115292896a

Change-Id: I96e52cb0fb5e4b97a8a21f31c6c52ab210a31cda
2019-03-25 02:31:19 -07:00
Anton Hansson fa96c5c4a0 Merge "Enable AB_OTA_UPDATER for mainline"
am: 30355b60f7

Change-Id: I1b4aa217952992d9ce4244a88a9b04ba0772af67
2019-03-25 02:30:31 -07:00
Anton Hansson 94fa0e75cb Merge "Put DEVICE/PRODUCT overlays in different partitions" 2019-03-25 09:25:47 +00:00
Anton Hansson 9274688574 Merge "Set file system types for mainline_arm64 partitions" 2019-03-25 09:24:16 +00:00
Anton Hansson 115292896a Merge "Make mainline_system_arm64 build only /system" 2019-03-25 09:23:30 +00:00
Anton Hansson 30355b60f7 Merge "Enable AB_OTA_UPDATER for mainline" 2019-03-25 09:20:32 +00:00
Tao Bao 1ece90be3b Merge changes I91bd3dce,I2e941fd9
am: 9a5093e5f9

Change-Id: Ic708931f9ef0ed9a23c8e7146013a7b8dea9e647
2019-03-24 10:44:21 -07:00
Tao Bao 9a5093e5f9 Merge changes I91bd3dce,I2e941fd9
* changes:
  releasetools: Fix alignment issue when signing APEXes.
  releasetools: Fix an issue in handling PRESIGNED APEX keys.
2019-03-24 17:31:55 +00:00
Tao Bao ffc9a30946 releasetools: Fix alignment issue when signing APEXes.
Previously it was following a wrong order by doing `zipalign` after
calling SignApk, which effectively compromised the signature. This CL
corrects the logic, and follows the same flow as in build system:
 - Pack APEX file;
 - `zipalign -f 4096`;
 - Call SignApk to sign the container with `-a 4096` flag.

Bug: 129148142
Test: Run sign_target_files_apks.py on taimen target_files.zip. Boot the
      image after signing.
Change-Id: I91bd3dce4f45c1891c5e122212a699f4808618fa
(cherry picked from commit 0e06cb0a8b)
2019-03-23 10:27:43 -07:00
Daniel Norman 19b9fe9fdf Merges dynamic partition misc_info.txt keys from both system and other.
To build a complete list of the dynamic partitions and partitions
groups, we need to merge the contribution from the system and other
target files.

Bug: 127687287
Test: Running merge_target_files.py and observing partition lists are
merged as expected.
Change-Id: I5bb9bd0e3179d48c9bfacdb3aca8253158f61cf6
2019-03-22 14:46:01 -07:00
Tao Bao 1e4cbfaf5c releasetools: Fix an issue in handling PRESIGNED APEX keys.
For PRESIGNED APEXes, we should keep carrying the matching public keys
at /system/etc/security/apex.

Bug: 129148142
Test: Run sign_target_files_apks.py on a target_files.zip with presigned
      APEXes. Check the output zip.
Change-Id: I2e941fd9b10e99d2db9df1e5308cbbe8c760177b
(cherry picked from commit bf3fb024cd)
2019-03-22 14:11:24 -07:00
Anton Hansson 1683198010 Set file system types for mainline_arm64 partitions
This config was in a weird state where it sets the OUT
directory for these partitions but not the file system
type. Within the build system, both of these variables
are used interchangeably to check whether these partitions
are expected to be present.

A typical mainline device is expected to /vendor and
/product, so just add these.

Bug: 120974093
Test: make
Change-Id: I803d7afdcadc37e4384ae80f08bc1c8db535d2f4
2019-03-22 17:25:43 +00:00
Martin Stjernholm 5355757f74 Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds."
am: c62e31242d

Change-Id: I01446f20619e93fd407a9085dba0c3511e15ca13
2019-03-22 08:43:22 -07:00
Martin Stjernholm c62e31242d Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds." 2019-03-22 15:35:09 +00:00
Martin Stjernholm d185bb29ce Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds.
Test: m systemimage
Bug: 124293228
Change-Id: I7a4744457396084ef9fd78d9c2f1efdabe0f981d
2019-03-22 14:24:08 +00:00
Anton Hansson 07fa9b13b4 Make mainline_system_arm64 build only /system
Configure this product not to build any of the other partitions.

Note that the only partition that currently has artifacts produced
is system_other, and this change doesn't appear to prevent odex/vdex
files from being created there anyway. However, it does allow
configuring the target device (mainline_arm64) to have more partitions
in a followup change.

Bug: 111533333
Test: make
Change-Id: Ib115cb03bc99b9b61e0d6f1b622784e7ad5fcea0
2019-03-22 14:07:49 +00:00