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
TreeHugger Robot
bc1246688d
Merge "Revert "Revert "Add libstagefright_omx_soft to vndk"""
2019-03-28 02:34:25 +00:00
Chong Zhang
f36de45bf8
Revert "Revert "Add libstagefright_omx_soft to vndk""
...
This reverts commit aabadd18ae
2019-03-27 18:53:40 +00:00
Colin Cross
c2bf5dd2a3
Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f am: d4ada79abd
...
am: 2172041a44
2019-03-27 11:33:24 -07:00
Colin Cross
2172041a44
Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f
...
am: d4ada79abd
2019-03-27 11:25:16 -07:00
Colin Cross
d4ada79abd
Merge "Understand the support library/androidx @Keep annotations"
...
am: 3f6483cb0f
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
f1a39e9170
Merge "releasetools: Remove the sanity check on APEX payload key names." am: c292edc22c am: ea673330bd
...
am: bce744ef67
2019-03-27 09:05:58 -07:00
Tao Bao
bce744ef67
Merge "releasetools: Remove the sanity check on APEX payload key names." am: c292edc22c
...
am: ea673330bd
2019-03-27 08:55:52 -07:00
Tao Bao
ea673330bd
Merge "releasetools: Remove the sanity check on APEX payload key names."
...
am: c292edc22c
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
e62a8b3d0e
Merge "Phase out all _a targets" am: fde506a6d7 am: 969c3cd3ba
...
am: c31910805e
2019-03-27 06:20:20 -07:00
SzuWei Lin
c31910805e
Merge "Phase out all _a targets" am: fde506a6d7
...
am: 969c3cd3ba
2019-03-27 06:11:50 -07:00
SzuWei Lin
969c3cd3ba
Merge "Phase out all _a targets"
...
am: fde506a6d7
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
John Tsai
e3721ac8c0
Merge "Revert "Add libstagefright_omx_soft to vndk""
2019-03-27 05:06:49 +00:00
John Tsai
aabadd18ae
Revert "Add libstagefright_omx_soft to vndk"
...
This reverts commit cb867c9a96
2019-03-27 05:05:50 +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
d602409b5d
Merge "releasetools: Re-enable verifying AVB-signed images." am: 5ed75d74e3 am: 26b2664dce
...
am: 06ee461ac2
2019-03-26 20:50:41 -07:00
Tao Bao
06ee461ac2
Merge "releasetools: Re-enable verifying AVB-signed images." am: 5ed75d74e3
...
am: 26b2664dce
2019-03-26 20:46:38 -07:00
Tao Bao
26b2664dce
Merge "releasetools: Re-enable verifying AVB-signed images."
...
am: 5ed75d74e3
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
TreeHugger Robot
bbc5debb3a
Merge "Add libstagefright_omx_soft to vndk"
2019-03-27 03:01:23 +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
ef6827f985
Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d7060a50f9 am: aa2eb553d8
...
am: 20f8f5c6ee
2019-03-26 15:36:52 -07:00
Sasha Smundak
20f8f5c6ee
Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d7060a50f9
...
am: aa2eb553d8
2019-03-26 15:27:16 -07:00
Anton Hansson
6e1026e591
Merge "Unset system-as-root for mainline" am: 2f5e18362b am: d3229a7179
...
am: 508d4a2797
2019-03-26 14:26:33 -07:00
Sasha Smundak
aa2eb553d8
Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true"
...
am: d7060a50f9
2019-03-26 14:19:30 -07:00
Anton Hansson
508d4a2797
Merge "Unset system-as-root for mainline" am: 2f5e18362b
...
am: d3229a7179
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
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
2019-03-26 12:13:37 -07:00
Anton Hansson
b73674c62f
Merge "Move EmergencyInfo to the /product hierarchy" am: cd0997c1e9 am: fb69403773
...
am: e7ef1b2cb9
2019-03-26 06:15:40 -07:00
Anton Hansson
e7ef1b2cb9
Merge "Move EmergencyInfo to the /product hierarchy" am: cd0997c1e9
...
am: fb69403773
2019-03-26 06:03:08 -07:00
Anton Hansson
fb69403773
Merge "Move EmergencyInfo to the /product hierarchy"
...
am: cd0997c1e9
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
a9dc8880b8
Merge "Add art-tools to host build outputs" am: 484e82f7ca am: b3c665b28b
...
am: f372581dea
2019-03-26 02:54:55 -07:00
Orion Hodson
f372581dea
Merge "Add art-tools to host build outputs" am: 484e82f7ca
...
am: b3c665b28b
2019-03-26 02:46:33 -07:00
Orion Hodson
b3c665b28b
Merge "Add art-tools to host build outputs"
...
am: 484e82f7ca
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
de01f0fdfe
Merge "Merges dynamic partition misc_info.txt keys from both system and other." am: c21a8448d1 am: 081eedce39
...
am: d857025380
2019-03-25 16:35:11 -07:00
Daniel Norman
cf4e8bf0b5
Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE." am: b455273444 am: 7100e93233
...
am: 2d5f9a0285
2019-03-25 16:33:11 -07:00
Daniel Norman
d857025380
Merge "Merges dynamic partition misc_info.txt keys from both system and other." am: c21a8448d1
...
am: 081eedce39
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
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
2019-03-25 16:26:53 -07:00
Daniel Norman
7100e93233
Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE."
...
am: b455273444
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
