Commit graph

50117 commits

Author SHA1 Message Date
Martin Stjernholm
9791a3c4d7 Merge "Make the APEX lib absence check optional, for local use." am: 20ac920654
am: 4598286860

Change-Id: Ief2749e8afa022d3a430dcd5ea376c2dee5496a1
2019-03-29 07:06:09 -07:00
Martin Stjernholm
4598286860 Merge "Make the APEX lib absence check optional, for local use."
am: 20ac920654

Change-Id: I076fa80c2a5496eaf0619a8c6a80fc77d698e0ee
2019-03-29 07:01:58 -07:00
Treehugger Robot
20ac920654 Merge "Make the APEX lib absence check optional, for local use." 2019-03-29 13:43:32 +00:00
Daniel Norman
1abb3e3371 Merge "Adds some tests for merge_target_files." am: 482e67f4ee
am: d8414c71b8

Change-Id: Iddd840b1708d9ce8df4b171b58f12b29d5f8c1e1
2019-03-28 21:35:57 -07:00
Daniel Norman
d8414c71b8 Merge "Adds some tests for merge_target_files."
am: 482e67f4ee

Change-Id: I246a1e6f2afceb42a5aca56b46291fbd37860ac5
2019-03-28 21:30:49 -07:00
Treehugger Robot
482e67f4ee Merge "Adds some tests for merge_target_files." 2019-03-29 04:16:57 +00:00
Dan Willemsen
7e8cc8ce6c Merge "Stop installing host packages via PRODUCT_PACKAGES" am: 672e98fac8
am: cc2155aa37

Change-Id: I11054d1c97426e30baafa97ec59bc5df45d27b39
2019-03-28 20:30:01 -07:00
Dan Willemsen
cc2155aa37 Merge "Stop installing host packages via PRODUCT_PACKAGES"
am: 672e98fac8

Change-Id: I0db73bc1f59b8f50f5529cbd0992fab9aa808a1b
2019-03-28 20:25:48 -07:00
Dan Willemsen
672e98fac8 Merge "Stop installing host packages via PRODUCT_PACKAGES" 2019-03-29 03:20:52 +00:00
SzuWei Lin
3e3c738d7f Merge "Fix build error on empty ramdisk" am: 5d225276ca
am: debaf1b8af

Change-Id: I0604d288ab42f3a347b6f5de22d7fb4742f6ea05
2019-03-28 20:17:53 -07:00
SzuWei Lin
debaf1b8af Merge "Fix build error on empty ramdisk"
am: 5d225276ca

Change-Id: I4f550bbd49dbbeb90d2855c13fb066bcd33b8e4a
2019-03-28 20:13:43 -07:00
Treehugger Robot
5d225276ca Merge "Fix build error on empty ramdisk" 2019-03-29 03:03:00 +00:00
Daniel Norman
6d82fa3961 Adds some tests for merge_target_files.
Test: python -m unittest test_merge_target_files
Bug: 129262038
Change-Id: Ibcb3b384b81ceaa1924a6cd402a8880bd3cfbba6
2019-03-28 14:43:30 -07:00
Martin Stjernholm
c9d5858f58 Make the APEX lib absence check optional, for local use.
Test: m systemimage (with and without failure)
Bug: 124293228
Bug: 129466457
Change-Id: I8bf5ba51232bb9961bdedd56d0f17ee1d8698f54
2019-03-28 15:08:32 +00:00
SzuWei Lin
29770fa2bf Fix build error on empty ramdisk
package `init_vendor` is the only content of ramdisk so far.
We would get build error if we do not include init_vendor.
The patch fix the build error for the case that ramdisk is empty.

Bug: 129386309
Test: lunch aosp_arm64_ab-userdebug; make ramdisk -j
Test: Build pass
Change-Id: I7c7c828b5f29350268d4789393b90740dd68162d
2019-03-28 13:41:01 +00:00
Colin Cross
2172041a44 Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f
am: d4ada79abd

Change-Id: Iec62861e620719e4a9601b5beee7208569954c5b
2019-03-27 11:25:16 -07:00
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
bce744ef67 Merge "releasetools: Remove the sanity check on APEX payload key names." am: c292edc22c
am: ea673330bd

Change-Id: I4f8e9f1ff4ff7eddd75c6f94683c9f261456b098
2019-03-27 08:55:52 -07: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
c31910805e Merge "Phase out all _a targets" am: fde506a6d7
am: 969c3cd3ba

Change-Id: I0da3a732a5e5b2b6770e913c752c4e3523b2c106
2019-03-27 06:11:50 -07: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
06ee461ac2 Merge "releasetools: Re-enable verifying AVB-signed images." am: 5ed75d74e3
am: 26b2664dce

Change-Id: I371f9d13ccab077184d1bff105c29c20b1441458
2019-03-26 20:46:38 -07: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
20f8f5c6ee Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d7060a50f9
am: aa2eb553d8

Change-Id: I5aebaa6c8a4bcf203c4e930039b4476d356cfdfa
2019-03-26 15:27:16 -07: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
Anton Hansson
508d4a2797 Merge "Unset system-as-root for mainline" am: 2f5e18362b
am: d3229a7179

Change-Id: I483ba2bcbcd7f475cc3a17a88d036edf16476060
2019-03-26 13:42:33 -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
e7ef1b2cb9 Merge "Move EmergencyInfo to the /product hierarchy" am: cd0997c1e9
am: fb69403773

Change-Id: I19883adf02fd6556c68e125e39eaa0dcece130c7
2019-03-26 06:03:08 -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
f372581dea Merge "Add art-tools to host build outputs" am: 484e82f7ca
am: b3c665b28b

Change-Id: I0d0fb37519285224e9387486ff69337c6a8a4273
2019-03-26 02:46:33 -07: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
d857025380 Merge "Merges dynamic partition misc_info.txt keys from both system and other." am: c21a8448d1
am: 081eedce39

Change-Id: I5c530f3cda4016fed33d15476d5fd3927b13aafc
2019-03-25 16:30:56 -07:00
Daniel Norman
2d5f9a0285 Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE." am: b455273444
am: 7100e93233

Change-Id: I1c925936c6d5992bd9544e87ab59836f46090ebb
2019-03-25 16:29:24 -07: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