91707a0be8
Merge changes from topic 'nyc-mr1-ue_sideload_recovery' into nyc-mr1-dev
...
am: cb69ac6c65
2016-08-12 18:07:28 +00:00
38f6f76f05
Replace OTA sideload verification key when signing A/B devices.
...
am: 95cc84a785
2016-08-12 18:07:00 +00:00
3f80f566b5
Install the update-payload-key in the recovery image as well.
...
am: 5134712d6f
2016-08-12 18:06:51 +00:00
bf5e3d168d
Merge "Replace META/care_map.txt when signing target files"
...
am: 7b11cacbba
2016-08-12 18:06:41 +00:00
7b11cacbba
Merge "Replace META/care_map.txt when signing target files"
2016-08-12 18:01:56 +00:00
cb69ac6c65
Merge changes from topic 'nyc-mr1-ue_sideload_recovery' into nyc-mr1-dev
...
* changes:
Replace OTA sideload verification key when signing A/B devices.
Install the update-payload-key in the recovery image as well.
2016-08-12 17:59:56 +00:00
53e3899222
Fix GET-INSTALL-PATH to work with Soong
...
This was printing all of the Soong modules in addition to the modules
defined in the ONE_SHOT_MAKEFILE. So replicate what we did with
MODULES-IN-* with GET-INSTALL-PATH-IN-* and update all the users.
Bug: 30191725
Change-Id: Ib1e4bf00f64d7a3e8cd91f44eaf1ff82fdfbf162
2016-08-12 05:10:51 +00:00
4f09900e67
Replace META/care_map.txt when signing target files
...
Do not copy the "META/care_map.txt" from the source zipfile when
signing the target files with sign_target_files_apks. Because we'll
generate a new care_map after rebuilding the system/vendor images;
and we'll write the new "META/care_map.txt" to the signed-target-file.
Change-Id: I6919cfdf8314a4084b5f612a9c89469f391486a4
Test: Run sign_target_files_apks locally, and the entry is updated.
Bug: 30812253
2016-08-11 18:04:27 -07:00
94219ae942
Merge "Fix discrepancy in SANITIZE_TARGET format with soong." am: 0d86fc57cd am: 0216097482
...
am: b8c54d7966
2016-08-12 00:10:29 +00:00
b8c54d7966
Merge "Fix discrepancy in SANITIZE_TARGET format with soong." am: 0d86fc57cd
...
am: 0216097482
2016-08-12 00:06:25 +00:00
0216097482
Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
...
am: 0d86fc57cd
2016-08-12 00:04:38 +00:00
0d86fc57cd
Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
2016-08-11 23:53:29 +00:00
3346f2d039
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e am: 782967785e am: 831bee139d
...
am: 2141e6de1a
2016-08-11 22:01:51 +00:00
2141e6de1a
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e am: 782967785e
...
am: 831bee139d
2016-08-11 21:59:04 +00:00
bd18f04bd3
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e am: 782967785e
...
am: 7171325d0b
2016-08-11 21:58:46 +00:00
831bee139d
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e
...
am: 782967785e
2016-08-11 21:55:18 +00:00
7171325d0b
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e
...
am: 782967785e
2016-08-11 21:55:18 +00:00
782967785e
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c
...
am: 1f85078b1e
2016-08-11 21:51:46 +00:00
1f85078b1e
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6
...
am: 21b4d9e01c
2016-08-11 21:48:46 +00:00
21b4d9e01c
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2
...
am: fdf4c8d8a6
2016-08-11 21:45:16 +00:00
fdf4c8d8a6
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
...
am: fa721839b2
2016-08-11 21:41:45 +00:00
b73aa507b7
releasetools: Update the path to /default.prop for A/B devices. am: 145cb2eaef
...
am: 69065ee7fb
2016-08-11 21:09:13 +00:00
69065ee7fb
releasetools: Update the path to /default.prop for A/B devices.
...
am: 145cb2eaef
2016-08-11 21:02:17 +00:00
6a0451f4e1
Merge "releasetools: Update the path to /default.prop for A/B devices." am: 6d64ff1bf7 am: 6eb5564025
...
am: cd6ce6182b
2016-08-11 20:49:12 +00:00
cd6ce6182b
Merge "releasetools: Update the path to /default.prop for A/B devices." am: 6d64ff1bf7
...
am: 6eb5564025
2016-08-11 20:45:46 +00:00
6eb5564025
Merge "releasetools: Update the path to /default.prop for A/B devices."
...
am: 6d64ff1bf7
2016-08-11 20:42:34 +00:00
145cb2eaef
releasetools: Update the path to /default.prop for A/B devices.
...
On A/B devices (i.e. system_root_image="true"), /default.prop is
packaged at ROOT/default.prop (as opposed to BOOT/RAMDISK/default.prop
for non-A/B devices). Update the path so that we handle properties like
ro.bootimage.build.fingerprint properly.
The one for recovery is not affected, which stays at
BOOT/RAMDISK/default.prop for A/B devices and gets updated correctly.
Bug: 30811237
Test: Verify the property in the generated signed-TF.zip.
Change-Id: Id201a042d7ea988a64f89c6d04f43326a9851e27
(cherry picked from commit 28e2fa1726
2016-08-11 13:40:59 -07:00
6d64ff1bf7
Merge "releasetools: Update the path to /default.prop for A/B devices."
2016-08-11 20:39:31 +00:00
d479b69c0e
Merge "Use soong_zip and zip2zip to make dist faster" am: 6dcdb45485 am: 96963dfd4d
...
am: 592cfc1859
2016-08-11 19:40:10 +00:00
fa721839b2
Update Security String to 2016-09-06 to platform and CTS for September
...
Security (+Quadrooter,-PZ)
Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a
2016-08-11 12:39:25 -07:00
592cfc1859
Merge "Use soong_zip and zip2zip to make dist faster" am: 6dcdb45485
...
am: 96963dfd4d
2016-08-11 19:36:44 +00:00
96963dfd4d
Merge "Use soong_zip and zip2zip to make dist faster"
...
am: 6dcdb45485
2016-08-11 19:33:10 +00:00
6dcdb45485
Merge "Use soong_zip and zip2zip to make dist faster"
2016-08-11 19:28:14 +00:00
28e2fa1726
releasetools: Update the path to /default.prop for A/B devices.
...
On A/B devices (i.e. system_root_image="true"), /default.prop is
packaged at ROOT/default.prop (as opposed to BOOT/RAMDISK/default.prop
for non-A/B devices). Update the path so that we handle properties like
ro.bootimage.build.fingerprint properly.
The one for recovery is not affected, which stays at
BOOT/RAMDISK/default.prop for A/B devices and gets updated correctly.
Bug: 30811237
Test: Verify the property in the generated signed-TF.zip.
Change-Id: Id201a042d7ea988a64f89c6d04f43326a9851e27
2016-08-11 11:28:51 -07:00
072cfe202e
Merge "Add support for NDK r13." am: 287093a98c am: ae49ab2f0f
...
am: 56745f6c7b
2016-08-11 16:59:52 +00:00
56745f6c7b
Merge "Add support for NDK r13." am: 287093a98c
...
am: ae49ab2f0f
2016-08-11 16:56:10 +00:00
ae49ab2f0f
Merge "Add support for NDK r13."
...
am: 287093a98c
2016-08-11 16:52:52 +00:00
287093a98c
Merge "Add support for NDK r13."
2016-08-11 16:46:34 +00:00
5e29cad1d5
Use soong_zip and zip2zip to make dist faster
...
soong_zip parallelizes the compression when creating a zip file, which
makes these packaging steps far shorter.
zip2zip skips the decompression and recompression during the -img- file
creation.
For an aosp_arm64-eng aosp/master build:
target_files.zip: 92s to 60s
symbols.zip: 147s to 7s
img.zip: 64s to 0.5s
There's still room to parallelize the image compression during
target_files.zip (add_img_to_target_files step takes most of the time)
Change-Id: I7b6a91e4a7dbeda2e49ca936b10181cff2f973d7
2016-08-10 16:13:58 -07:00
0960770e0d
Add support for NDK r13.
...
Test: make checkbuild
Change-Id: I4521c768c67771cee9df9e59ed45344c40c48a38
2016-08-10 16:05:19 -07:00
95cc84a785
Replace OTA sideload verification key when signing A/B devices.
...
The update-payload-key is used by update_engine_sideload from recovery
to verify an update payload.
Bug: 27178350
(cherry picked from commit b3e8ce6d1d
2016-08-10 11:10:24 -07:00
5134712d6f
Install the update-payload-key in the recovery image as well.
...
The update-payload-key is required to verify the contents of the OTA in
recovery while sideloading an update.
Bug: 27178350
TEST=`make` builds a boot.img with the payload key in recovery.
(cherry picked from commit c6ebe9fcd7
2016-08-10 11:10:11 -07:00
e8fbea342f
Merge changes from topic 'ab_sideload' am: 3750ed3e17 am: 93ff77ad1a
...
am: 820bc82bed
2016-08-10 05:07:24 +00:00
820bc82bed
Merge changes from topic 'ab_sideload' am: 3750ed3e17
...
am: 93ff77ad1a
2016-08-10 05:04:23 +00:00
93ff77ad1a
Merge changes from topic 'ab_sideload'
...
am: 3750ed3e17
2016-08-10 05:00:57 +00:00
3750ed3e17
Merge changes from topic 'ab_sideload'
...
* changes:
Replace OTA sideload verification key when signing A/B devices.
Install the update-payload-key in the recovery image as well.
2016-08-10 03:55:24 +00:00
d0528b4463
N-DR/N-MR1 is 7.1
...
Bug: 30734691
Change-Id: I20a4e705ad972bbf24fb0aab65ab410c11496199
2016-08-09 16:44:23 -07:00
07522023f8
Merge "build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT" into nyc-mr1-dev am: 9b9520018b
...
am: 92f2a8032b
2016-08-09 20:58:25 +00:00
f4d5aff88b
build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT am: d491fcf438
...
am: 92579193db
2016-08-09 20:58:25 +00:00
92f2a8032b
Merge "build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT" into nyc-mr1-dev
...
am: 9b9520018b
2016-08-09 20:55:20 +00:00
Alex Deymo