Commit graph

52258 commits

Author SHA1 Message Date
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
a9dc8880b8 Merge "Add art-tools to host build outputs" am: 484e82f7ca am: b3c665b28b
am: f372581dea

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

Change-Id: I9d788369617dbca5df4bbaf24fbcc9b505d0e18e
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

Change-Id: Id733c79d53407cccba52563a79e4bfab9cec03f7
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

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
Chong Zhang
cb867c9a96 Add libstagefright_omx_soft to vndk
This is the base of all soft omx components, plugins
only need to link this instead of libstagefright_omx.

bug: 129272021
test: builds
Change-Id: I7fcf03d23ab7ed93269532bab55c972585178ad5
2019-03-25 15:07:41 -07: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
Anton Hansson
0af2847ba0 Merge "Make mainline device enable property split" am: 072795054a am: cc85e0377c
am: 802e6faa77

Change-Id: I055a9967654e1efee1274d28cdea45b8113e43b7
2019-03-25 11:59:58 -07:00
Anton Hansson
802e6faa77 Merge "Make mainline device enable property split" am: 072795054a
am: cc85e0377c

Change-Id: I931d762c4c008874d05267e4583528eebca25eec
2019-03-25 11:41:07 -07: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
db064f1f1a Merge "Put DEVICE/PRODUCT overlays in different partitions" am: 94fa0e75cb am: fd946975d0
am: 691c979b62

Change-Id: I1e9c9b79b931229ed3142d1921d784a6bad7baed
2019-03-25 02:46:53 -07:00
Anton Hansson
5fbbea2d18 Merge "Set file system types for mainline_arm64 partitions" am: 9274688574 am: 3632d053d0
am: eb49e55ad7

Change-Id: I3365a50b76f9e9116db48b75aa2c591f155bc414
2019-03-25 02:41:15 -07:00
Anton Hansson
6572dc41c3 Merge "Make mainline_system_arm64 build only /system" am: 115292896a am: 27ade4181f
am: f5c94a9570

Change-Id: Ia7abef0ee930bf34d3154a085c7a8c99042eaaae
2019-03-25 02:39:59 -07:00
Anton Hansson
ccf93e6096 Merge "Enable AB_OTA_UPDATER for mainline" am: 30355b60f7 am: fa96c5c4a0
am: 5d6db45d82

Change-Id: I752e88c304e500e374ae42c3218ca4647e493374
2019-03-25 02:38:52 -07:00
Anton Hansson
691c979b62 Merge "Put DEVICE/PRODUCT overlays in different partitions" am: 94fa0e75cb
am: fd946975d0

Change-Id: Id4f8e8ce0ad6448d71b7a619805c4bae06cfcbca
2019-03-25 02:38:24 -07:00
Anton Hansson
eb49e55ad7 Merge "Set file system types for mainline_arm64 partitions" am: 9274688574
am: 3632d053d0

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

Change-Id: Id7fa379c859a10555b26d7871a536cdc60d3e9db
2019-03-25 02:36:41 -07:00
Anton Hansson
5d6db45d82 Merge "Enable AB_OTA_UPDATER for mainline" am: 30355b60f7
am: fa96c5c4a0

Change-Id: Ib683460beb5b6ba9f2ed6a11699919b899828108
2019-03-25 02:35:42 -07: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
c27bcf5f66 Merge changes I91bd3dce,I2e941fd9 am: 9a5093e5f9 am: 1ece90be3b
am: 5b8d482ebe

Change-Id: I0506039b36fd051e9f9e33e59391eb8050e4318e
2019-03-24 10:52:16 -07:00
Tao Bao
5b8d482ebe Merge changes I91bd3dce,I2e941fd9 am: 9a5093e5f9
am: 1ece90be3b

Change-Id: I66736e34d4891effe13a25e08dbdef454b222673
2019-03-24 10:48:09 -07: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
Tao Bao
0e06cb0a8b 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
2019-03-22 23:25:12 -07:00
Tao Bao
5d816d89eb Merge "releasetools: Fix an issue in handling PRESIGNED APEX keys." 2019-03-22 21:49:47 +00: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