OSDN Git Service
Ian Pedowitz [Mon, 15 Aug 2016 17:24:24 +0000 (17:24 +0000)]
Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev
Adam Seaton [Fri, 12 Aug 2016 21:28:49 +0000 (21:28 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours am:
cdbdfcdbd5 am:
afe698d76e am:
0a3ae2d78d am:
b542d46745
am:
30cae665ea
Change-Id: I68291e30fb198c029999bf25cebbd9cfe630d352
Adam Seaton [Fri, 12 Aug 2016 21:25:17 +0000 (21:25 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours am:
cdbdfcdbd5 am:
afe698d76e am:
0a3ae2d78d
am:
b542d46745
Change-Id: I030d17ffefee2096df8eaf5b9dce72b86a0bca01
Adam Seaton [Fri, 12 Aug 2016 21:21:45 +0000 (21:21 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours am:
cdbdfcdbd5 am:
afe698d76e
am:
0a3ae2d78d
Change-Id: I6d317744f1269b1760d4c12a734e3377033acbd7
Adam Seaton [Fri, 12 Aug 2016 21:18:17 +0000 (21:18 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours am:
cdbdfcdbd5
am:
afe698d76e
Change-Id: I8b5cc4ff2992ffe0f229a811076b215b7d0ab0af
Adam Seaton [Fri, 12 Aug 2016 21:14:53 +0000 (21:14 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours
am:
cdbdfcdbd5
Change-Id: Ic0300b3b3018dc08277ddc0398143ae8bcbd0fbc
Adam Seaton [Fri, 12 Aug 2016 21:10:44 +0000 (21:10 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31
am:
d5c59f3b97 -s ours
Change-Id: Ibcf2cb117de238fa76e0551fd97a12d88200e30d
Tianjie Xu [Fri, 12 Aug 2016 01:04:27 +0000 (18:04 -0700)]
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
(cherry picked from commit
4f09900e676f7343643ada3797c3597f9c363015)
Alex Deymo [Fri, 12 Aug 2016 17:59:55 +0000 (17:59 +0000)]
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.
Adam Seaton [Thu, 11 Aug 2016 21:55:18 +0000 (21:55 +0000)]
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
Change-Id: Ic5565af400aa3d3c245d5ab25d65a6244a46907d
Adam Seaton [Thu, 11 Aug 2016 21:51:46 +0000 (21:51 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am:
fa721839b2 am:
fdf4c8d8a6 am:
21b4d9e01c
am:
1f85078b1e
Change-Id: Id8709a33bf19fb106341a8aed5f2978adf91a7ef
Adam Seaton [Thu, 11 Aug 2016 21:48:46 +0000 (21:48 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am:
fa721839b2 am:
fdf4c8d8a6
am:
21b4d9e01c
Change-Id: I24dd917aef85ca2bb36b310ed97e57fbedac4558
Adam Seaton [Thu, 11 Aug 2016 21:45:16 +0000 (21:45 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am:
fa721839b2
am:
fdf4c8d8a6
Change-Id: I5ad798a99ea890bff77c9cd579a72e3794df92e0
Adam Seaton [Thu, 11 Aug 2016 21:41:45 +0000 (21:41 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
am:
fa721839b2
Change-Id: Iff74354f3540185eff4ae1b44600f5d00e1029cd
Tao Bao [Thu, 11 Aug 2016 18:00:58 +0000 (11:00 -0700)]
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
28e2fa1726f3434417e2f0d5f1a810cbd657a5e3)
Adam Seaton [Thu, 11 Aug 2016 19:39:25 +0000 (12:39 -0700)]
Update Security String to 2016-09-06 to platform and CTS for September
Security (+Quadrooter,-PZ)
Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a
Alex Deymo [Thu, 4 Aug 2016 23:06:12 +0000 (16:06 -0700)]
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
b3e8ce6d1d936cddb6eb4a5052de8ed7ba85d68e)
Change-Id: Iac239732251e550e9966bf284b68bc9d578f22ff
Alex Deymo [Thu, 4 Aug 2016 03:52:54 +0000 (20:52 -0700)]
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
c6ebe9fcd7ca0c991f5ae0e711a251959d0d41f4)
Change-Id: I0128d7f684d32201e227acce798b25f12982eaaa
Ian Pedowitz [Mon, 8 Aug 2016 19:45:03 +0000 (12:45 -0700)]
N-DR/N-MR1 is 7.1
Bug:
30734691
Change-Id: I20a4e705ad972bbf24fb0aab65ab410c11496199
TreeHugger Robot [Tue, 9 Aug 2016 20:51:33 +0000 (20:51 +0000)]
Merge "build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT" into nyc-mr1-dev
Nick Desaulniers [Mon, 8 Aug 2016 17:51:10 +0000 (10:51 -0700)]
build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT
Bug:
30681215
Change-Id: Ic3a18a65f9b1251c2592fc54569b2c6af99e6ece
Adam Seaton [Tue, 9 Aug 2016 00:11:11 +0000 (00:11 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am:
a53b868e6e am:
e158db8ad2 am:
68870731a5 am:
f7de14b8a1
am:
2d033a9e51
Change-Id: Iacc3e198cff56bdd396a64e594d19e4ca635c3e4
Adam Seaton [Tue, 9 Aug 2016 00:05:36 +0000 (00:05 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am:
a53b868e6e am:
e158db8ad2 am:
68870731a5
am:
f7de14b8a1
Change-Id: I1412b8cee615535abe366b43ce4041efb4488bde
Adam Seaton [Mon, 8 Aug 2016 23:57:10 +0000 (23:57 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3
am:
a14e8c2f31
Change-Id: I471611e0996ab801d105a392fafbb8c1008c3350
Adam Seaton [Mon, 8 Aug 2016 23:57:05 +0000 (23:57 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am:
a53b868e6e am:
e158db8ad2
am:
68870731a5
Change-Id: I3e302e74d090485c179381a085d39d17bc212d67
Adam Seaton [Mon, 8 Aug 2016 23:54:06 +0000 (23:54 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe
am:
f63dfac0e3
Change-Id: I02999f460037cf8b6353c7be86c58459e8226efc
Adam Seaton [Mon, 8 Aug 2016 23:54:05 +0000 (23:54 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am:
a53b868e6e
am:
e158db8ad2
Change-Id: I61ddf7619069a6dc3bb10a70c6eca4d55a33c3fe
Adam Seaton [Mon, 8 Aug 2016 23:51:35 +0000 (23:51 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667
am:
48e00645fe
Change-Id: I284881c64f9370598434871634a7fc7794bc6581
Adam Seaton [Mon, 8 Aug 2016 23:48:10 +0000 (23:48 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin
am:
a53b868e6e
Change-Id: I0655a62b517357f75022f902d26b44a5c8aeaf85
Adam Seaton [Mon, 8 Aug 2016 23:48:05 +0000 (23:48 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5
am:
5ed4043667
Change-Id: I14818a4b4220874c816fbe9dc1d150b598f030e5
Adam Seaton [Mon, 8 Aug 2016 23:45:04 +0000 (23:45 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f
am:
637fa9c4c5
Change-Id: I8f5459266c69eddf11101f9be3a46beecdc71dad
Adam Seaton [Mon, 8 Aug 2016 23:42:34 +0000 (23:42 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin
am:
cc5148493f
Change-Id: Ib5a5e433d0a94040a4261dae9555606c34d18e81
Adam Seaton [Mon, 8 Aug 2016 22:08:45 +0000 (15:08 -0700)]
Update Security String to 2016-09-07 to platform and CTS for September
respin
Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
Adam Seaton [Mon, 8 Aug 2016 21:59:46 +0000 (14:59 -0700)]
Update security string to 2016-09-07 to platform and CTS for September
respin
Change-Id: I0f753925387a19fa055efd08ce026ef98431ef03
Dan Willemsen [Sat, 6 Aug 2016 00:23:33 +0000 (17:23 -0700)]
Allow prebuilt APKs to specify LOCAL_INSTALLED_MODULE_STEM
We've got a case where two different prebuilt APKs need to have the same
apk name (but using a different LOCAL_MODULE_PATH).
Bug:
30470308
Change-Id: I5551e720d173623daa757c4c0aabc8e1a423ac38
Joe Fernandez [Thu, 4 Aug 2016 00:59:34 +0000 (00:59 +0000)]
docs: Add TOC template logic for ARC docs am:
accb6660a5
am:
9d606e0082
Change-Id: I99c246c017544d7639cc110eb02b4f2d5fd07865
Joe Fernandez [Thu, 4 Aug 2016 00:51:04 +0000 (00:51 +0000)]
docs: Add TOC template logic for ARC docs
am:
accb6660a5
Change-Id: I58282b1958be93e2247f873a9e8b13d0e192b56a
Joe Fernandez [Tue, 2 Aug 2016 00:15:14 +0000 (17:15 -0700)]
docs: Add TOC template logic for ARC docs
b/
30114799
Change-Id: If36c3f9d46bf916b56b2884446451d423565606c
(cherry picked from commit
99aacfe83476f3806d4b9b86ad61670844141bc1)
Adam Seaton [Tue, 2 Aug 2016 18:34:52 +0000 (18:34 +0000)]
Merge "Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH" into nyc-mr1-dev
Joe Fernandez [Tue, 2 Aug 2016 00:39:13 +0000 (00:39 +0000)]
docs: Add TOC template logic for ARC docs
am:
99aacfe834
Change-Id: I2831d967cbb2c1c5733ef3b6f235dbe96e75c565
Joe Fernandez [Tue, 2 Aug 2016 00:15:14 +0000 (17:15 -0700)]
docs: Add TOC template logic for ARC docs
b/
30114799
Change-Id: If36c3f9d46bf916b56b2884446451d423565606c
Adam Seaton [Fri, 29 Jul 2016 18:52:35 +0000 (11:52 -0700)]
Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH
Change-Id: Id4eeaedac02900df7e635f378b54c2e58e9b5c6e
Dan Willemsen [Thu, 28 Jul 2016 22:56:48 +0000 (15:56 -0700)]
Limit find-copy-subdir-files to just files
This is used to add entries to PRODUCT_COPY_FILES -- those should always
be files, not directories or anything else special.
Bug:
30482029
Change-Id: I2691ae81c344c22e518c6b10cd485c73d654a03b
Adam Seaton [Thu, 28 Jul 2016 22:59:39 +0000 (22:59 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d am:
8118421197 am:
ed2fbe64ff -s ours am:
41a8f2bd55 am:
48b6f7db14 am:
989e951aa2 am:
3c8083425d
am:
e53fba3ebb
Change-Id: I15c4d862120b7e99a711b3f6485899b9eff1abbb
Adam Seaton [Thu, 28 Jul 2016 22:54:39 +0000 (22:54 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d am:
8118421197 am:
ed2fbe64ff -s ours am:
41a8f2bd55 am:
48b6f7db14 am:
989e951aa2
am:
3c8083425d
Change-Id: I2b903312ec651432d2753a4e8227c0fbe5823e58
Adam Seaton [Thu, 28 Jul 2016 22:51:42 +0000 (22:51 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d am:
8118421197 am:
ed2fbe64ff -s ours am:
41a8f2bd55 am:
48b6f7db14
am:
989e951aa2
Change-Id: Ifa303a802377ab801633562200aac66899977b00
Adam Seaton [Thu, 28 Jul 2016 22:49:13 +0000 (22:49 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d am:
8118421197 am:
ed2fbe64ff -s ours am:
41a8f2bd55
am:
48b6f7db14
Change-Id: I67d04d6ea6885be10aaf98d9edccbd2774e1c109
Adam Seaton [Thu, 28 Jul 2016 22:47:09 +0000 (22:47 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d am:
8118421197 am:
ed2fbe64ff -s ours
am:
41a8f2bd55
Change-Id: I2262c1a520c31d3c6ef94866c0e30f5ad9cb4ed2
Adam Seaton [Thu, 28 Jul 2016 22:44:37 +0000 (22:44 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d am:
8118421197
am:
ed2fbe64ff -s ours
Change-Id: I898a77183877016cc9411a5d124548c4d60d2b26
Adam Seaton [Thu, 28 Jul 2016 22:36:12 +0000 (22:36 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c am:
d6eb8a739d
am:
8118421197
Change-Id: I6193353b95e616370adbfa2618d568073f167790
Adam Seaton [Thu, 28 Jul 2016 22:34:12 +0000 (22:34 +0000)]
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am:
525c6aa541 am:
63ec9d8f23 am:
04fe21c7b7 am:
8736caaba9
am:
f25aadc812
Change-Id: I7172d0aef5029648ad1d7792eaa9e291ab41ec97
Adam Seaton [Thu, 28 Jul 2016 22:34:11 +0000 (22:34 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c am:
a96455528c
am:
d6eb8a739d
Change-Id: Ia2aeb08f9cb030048320beb6f5e0d625ff8b0b42
Adam Seaton [Thu, 28 Jul 2016 22:31:12 +0000 (22:31 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b am:
a08cbbb97c
am:
a96455528c
Change-Id: I019d3216bafbbba0158ddd9ff93f0d8edbd7c40c
Adam Seaton [Thu, 28 Jul 2016 22:31:08 +0000 (22:31 +0000)]
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am:
525c6aa541 am:
63ec9d8f23 am:
04fe21c7b7
am:
8736caaba9
Change-Id: Id5b440e150d514e85ee28aab7830d1d94e8cc5b9
Adam Seaton [Thu, 28 Jul 2016 22:28:42 +0000 (22:28 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a am:
48e360c73b
am:
a08cbbb97c
Change-Id: Ic0c7a50458cf9967baace9f3a46a5f61013b663d
Adam Seaton [Thu, 28 Jul 2016 22:28:42 +0000 (22:28 +0000)]
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am:
525c6aa541 am:
63ec9d8f23
am:
04fe21c7b7
Change-Id: Ia227b340514a58857cbf8f1f5ca35bbad9930e2b
Adam Seaton [Thu, 28 Jul 2016 22:25:45 +0000 (22:25 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278 am:
a234c54e2a
am:
48e360c73b
Change-Id: Id53bea6c0a355d54c461b987e5a992c9211e6d32
Adam Seaton [Thu, 28 Jul 2016 22:25:41 +0000 (22:25 +0000)]
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am:
525c6aa541
am:
63ec9d8f23
Change-Id: I7d52cf2afe884476c22aaa429abc16e277620f10
Adam Seaton [Thu, 28 Jul 2016 22:23:40 +0000 (22:23 +0000)]
Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev
am:
525c6aa541
Change-Id: I53403552530c0c449e3cd7f1afa59a9853712e88
Adam Seaton [Thu, 28 Jul 2016 22:23:06 +0000 (22:23 +0000)]
Updating security string to 2016-09-05 in preparation for 2016 September OTA for b/
30224278
am:
a234c54e2a
Change-Id: Icef9c0d868b8658faf79aabc99a811e0b715c362
Adam Seaton [Thu, 28 Jul 2016 21:16:34 +0000 (14:16 -0700)]
Updating security string to 2016-09-05 to platform and CTS in preparation
for 2016 September OTA on mnc-dev
b/
30224278
Change-Id: I0f0591b7f0f033320de422c4019e056231228539
Adam Seaton [Thu, 28 Jul 2016 21:09:57 +0000 (14:09 -0700)]
Updating security string to 2016-09-05 in preparation for 2016 September
OTA for b/
30224278
Change-Id: I055d0cc3a1a5f640dabf7a404c70c317e57959ca
Tao Bao [Thu, 28 Jul 2016 02:45:43 +0000 (19:45 -0700)]
Handle multiple APKs from the same package in check_target_files_signatures.py.
We were using the package name as the key to index APKs. APKs from the
same package got messed up and gave wrong signature summary. Switch to
using the package filename as the key, which is identical in a given build.
Also fix the trailing space when printing the signature summary.
Bug:
30418268
Test: Run with a target_files.zip that has multiple APKs from the same package.
Change-Id: I6317e8c05e987c5690915e05c294153d10e2f0ab
(cherry picked from commit
6a54299fbd16a3bd2051f08d5dbdaf94b95bf485)
Zach Jang [Thu, 21 Jul 2016 15:27:58 +0000 (15:27 +0000)]
Merge \\\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\\" into mnc-dev am:
cb4ba4c90c am:
942c341ab1 am:
37688e09fb am:
bf8d3a2105
am:
37c17db1c6
Change-Id: Ia894b80e649552407714a685c2c33082204fb474
Zach Jang [Thu, 21 Jul 2016 15:27:57 +0000 (15:27 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a am:
2c64061e72 -s ours am:
f1be3289ff am:
f1ee7d660f am:
d3d24134a6 am:
f94bec3382
am:
d1dae843e3
Change-Id: I072ee0a99b35aab5b6f7c30335da6f4c211b331a
Claes Elgemark [Thu, 21 Jul 2016 15:27:56 +0000 (15:27 +0000)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am:
687c266053 am:
160e0054dd am:
96e784eb4a -s ours
am:
f8f74bafd2
Change-Id: I8777c82581d0ba08117c4bc50a6b78b626a81524
Zach Jang [Thu, 21 Jul 2016 15:21:00 +0000 (15:21 +0000)]
Merge \\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\" into mnc-dev am:
cb4ba4c90c am:
942c341ab1 am:
37688e09fb
am:
bf8d3a2105
Change-Id: I92f956bcbd342f0fa953fed5ffb6d1462bbe3c4c
Zach Jang [Thu, 21 Jul 2016 15:20:59 +0000 (15:20 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a am:
2c64061e72 -s ours am:
f1be3289ff am:
f1ee7d660f am:
d3d24134a6
am:
f94bec3382
Change-Id: I1509caa4109a7ea93f179e7d640e554f0cd96b74
Claes Elgemark [Thu, 21 Jul 2016 15:20:59 +0000 (15:20 +0000)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am:
687c266053 am:
160e0054dd
am:
96e784eb4a -s ours
Change-Id: I95310c02d97efd4331e0cb0f759ec26b8b403edb
Zach Jang [Wed, 20 Jul 2016 18:20:19 +0000 (18:20 +0000)]
Merge \\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\" into mnc-dev am:
cb4ba4c90c am:
942c341ab1
am:
37688e09fb
Change-Id: I9c13a7d9f2ab8d96faaea5501131dd3b248fcf91
Zach Jang [Wed, 20 Jul 2016 18:17:18 +0000 (18:17 +0000)]
Merge \\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\" into mnc-dev am:
cb4ba4c90c
am:
942c341ab1
Change-Id: I29c8fae334dbd8f7d8a94dfa9dcf69c77aa18103
Zach Jang [Wed, 20 Jul 2016 18:17:18 +0000 (18:17 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a am:
2c64061e72 -s ours am:
f1be3289ff am:
f1ee7d660f
am:
d3d24134a6
Change-Id: Ia90d6d102d9036529742f9491bd1c6ae56d3f8f8
Zach Jang [Wed, 20 Jul 2016 18:14:48 +0000 (18:14 +0000)]
Merge \"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\" into mnc-dev
am:
cb4ba4c90c
Change-Id: I7d4110e803b2775a4009c5adf1d249f98a2d0fa3
Zach Jang [Wed, 20 Jul 2016 18:14:48 +0000 (18:14 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a am:
2c64061e72 -s ours am:
f1be3289ff
am:
f1ee7d660f
Change-Id: I18f7a195e607860043eeb0bc5ef4ee28ec8325a1
Zach Jang [Wed, 20 Jul 2016 18:11:18 +0000 (18:11 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a am:
2c64061e72 -s ours
am:
f1be3289ff
Change-Id: I6f093b1be27f18d1d3aea0c44c031cf6c0d67d2d
Zach Jang [Wed, 20 Jul 2016 18:09:44 +0000 (18:09 +0000)]
Merge "Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA" into mnc-dev
Zach Jang [Wed, 20 Jul 2016 18:08:46 +0000 (18:08 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5 am:
984987506a
am:
2c64061e72 -s ours
Change-Id: I134b3a61251b175b01c21ee11997cf85e131308f
Zach Jang [Tue, 19 Jul 2016 20:20:45 +0000 (13:20 -0700)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
b/
30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
Claes Elgemark [Wed, 20 Jul 2016 17:47:41 +0000 (17:47 +0000)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am:
687c266053
am:
160e0054dd
Change-Id: I9851d5d1fc397191a35b6ab85cdf66b5bd222ff7
Claes Elgemark [Wed, 20 Jul 2016 17:44:42 +0000 (17:44 +0000)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
am:
687c266053
Change-Id: I5531a0fa456311f2a4824c7a9cdb5e3f43461da0
Claes Elgemark [Tue, 2 Jun 2015 09:03:27 +0000 (11:03 +0200)]
DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
Strip path to be able to use outside a build e.g.
when resigning using the dist tools zip.
Bug:
30222185
Bug:
30249120
Change-Id: I492dcfd5791b66c17ae2e751cc8f67127e97b800
(cherry picked from commit
ec99604b07132358b92bb053777b4db6a0ae0223)
Zach Jang [Wed, 20 Jul 2016 01:14:11 +0000 (01:14 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8 am:
46a86bf9d5
am:
984987506a
Change-Id: Icce72413eaf703145c4e0478926839476df79588
Zach Jang [Wed, 20 Jul 2016 01:10:46 +0000 (01:10 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f am:
c8b3df9fb8
am:
46a86bf9d5
Change-Id: If879ae7d694caa588554628a4fff3558009aa694
Zach Jang [Wed, 20 Jul 2016 01:08:10 +0000 (01:08 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879 am:
d46066851f
am:
c8b3df9fb8
Change-Id: Ie46aa33c4d927bed0024887c3ef59f45f516e3f9
Zach Jang [Wed, 20 Jul 2016 01:05:41 +0000 (01:05 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d am:
5e9c40c879
am:
d46066851f
Change-Id: Ibfe7fbdbfa81f053a5dd4082a8ebb403e7c57930
Zach Jang [Wed, 20 Jul 2016 01:02:41 +0000 (01:02 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA am:
4d7c3a4c0d
am:
5e9c40c879
Change-Id: I8405b34a45cf8d0a0dc16bfc6b216f5c66b7f6ba
Zach Jang [Wed, 20 Jul 2016 01:00:09 +0000 (01:00 +0000)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
am:
4d7c3a4c0d
Change-Id: I848cd6c2068f54c54a53dc5d0bb35c54fc7eb23f
Zach Jang [Tue, 19 Jul 2016 20:20:45 +0000 (13:20 -0700)]
Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
b/
30224278
Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
Kirill Grouchnikov [Mon, 18 Jul 2016 14:26:46 +0000 (10:26 -0400)]
Rename the source of core-utils module to core-utils
Change-Id: Ia2db5386ca0048ed70a310a9b13e074d2fedd0a7
(cherry picked from commit
73b833b6a5d9b03c460ec61c5d781c032d6dbe1f)
Tianjie Xu [Mon, 11 Jul 2016 17:59:47 +0000 (17:59 +0000)]
Merge "Add care_map to target_files package" into nyc-mr1-dev
Tianjie Xu [Tue, 8 Mar 2016 00:31:19 +0000 (16:31 -0800)]
Add care_map to target_files package
Generate a new file containing care_data of system (and vendor)
partition, and add it under META/ of target file package. For
A/B update, copy this file to OTA package for later use by
update_verifier.
Bug:
27175949
Change-Id: I90bb972703afaeb94bc3efe718fd81b1cfbcabcc
Tao Bao [Fri, 8 Jul 2016 19:47:10 +0000 (19:47 +0000)]
Merge "releasetools: Fix the payload public key replacement." into nyc-mr1-dev
Tao Bao [Thu, 7 Jul 2016 16:09:58 +0000 (09:09 -0700)]
releasetools: Fix the detection of using squashfs.
We should disable using imgdiff if *any* of the source and target
partitions uses squashfs.
Bug:
30004734
Test: Create an incremental with two builds with one of them uses squashfs.
Change-Id: I826cd13d7b852c548e4b45e61f5ae00f6407cac3
Tao Bao [Wed, 6 Jul 2016 22:28:59 +0000 (15:28 -0700)]
releasetools: Fix the payload public key replacement.
update_engine expects the extracted public key instead of the
certificate.
Bug:
28701652
Change-Id: I292d39da9e039f96d01a4214226aeb46f8cb881d
Ian Pedowitz [Wed, 6 Jul 2016 18:46:23 +0000 (18:46 +0000)]
Merge "Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""" into nyc-mr1-dev
Ian Pedowitz [Tue, 5 Jul 2016 18:25:14 +0000 (18:25 +0000)]
Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""
This reverts commit
266600b6391a142c1127db2c2dd738cb1bc7a0df.
Bug:
29117805
Change-Id: Idfc80ee1a91f76088c59a2ebe29a3d96bf02bf03
Alan Viverette [Sat, 2 Jul 2016 23:40:37 +0000 (19:40 -0400)]
Update pathmap.mk for refactored support library
Fix build following fast-forward of support library branch.
Change-Id: Ib9701b6f31f5b4a18067380875b145d990a07dd3
David Friedman [Fri, 1 Jul 2016 22:42:03 +0000 (22:42 +0000)]
Merge \"Docs: Adding info in support of TOC for new Performance section.\" into nyc-dev
am:
77a4215191
Change-Id: If71aa4f05bd7d0f732cf91c1835db95ffab47b64
Joe Fernandez [Fri, 1 Jul 2016 22:18:19 +0000 (22:18 +0000)]
Merge "Docs: Adding info in support of TOC for new Performance section." into nyc-dev
Michael Wright [Wed, 29 Jun 2016 14:33:37 +0000 (15:33 +0100)]
N MR1 is API 25
Bug:
29816674
Change-Id: Iaaf6de5e99cf21b489afe677a8bf8b5385d9ca6e
OSDN Git Service
