Commit Graph

9824 Commits

Author SHA1 Message Date
Andriy Naborskyy
cface8c009 Merge "board-specific prep recovery imagefix recovery size issue" into nyc-mr1-dev 2016-08-16 14:06:46 +00:00
Ian Pedowitz
6dfac06e2c Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev 2016-08-15 17:24:24 +00:00
Alex Deymo
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
Adam Seaton
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

Change-Id: Ic5565af400aa3d3c245d5ab25d65a6244a46907d
2016-08-11 21:55:18 +00:00
Adam Seaton
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

Change-Id: Id8709a33bf19fb106341a8aed5f2978adf91a7ef
2016-08-11 21:51:46 +00:00
Adam Seaton
1f85078b1e 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
2016-08-11 21:48:46 +00:00
Adam Seaton
21b4d9e01c Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2
am: fdf4c8d8a6

Change-Id: I5ad798a99ea890bff77c9cd579a72e3794df92e0
2016-08-11 21:45:16 +00:00
Adam Seaton
fdf4c8d8a6 Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
am: fa721839b2

Change-Id: Iff74354f3540185eff4ae1b44600f5d00e1029cd
2016-08-11 21:41:45 +00:00
Adam Seaton
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
Alex Deymo
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)

Change-Id: I0128d7f684d32201e227acce798b25f12982eaaa
2016-08-10 11:10:11 -07:00
Ian Pedowitz
d0528b4463 N-DR/N-MR1 is 7.1
Bug: 30734691
Change-Id: I20a4e705ad972bbf24fb0aab65ab410c11496199
2016-08-09 16:44:23 -07:00
TreeHugger Robot
9b9520018b Merge "build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT" into nyc-mr1-dev 2016-08-09 20:51:33 +00:00
Nick Desaulniers
d491fcf438 build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT
Bug: 30681215
Change-Id: Ic3a18a65f9b1251c2592fc54569b2c6af99e6ece
2016-08-09 12:29:26 -07:00
Adam Seaton
143faf4aa4 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
2016-08-09 00:11:11 +00:00
Adam Seaton
2d033a9e51 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
2016-08-09 00:05:36 +00:00
Adam Seaton
f7de14b8a1 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2
am: 68870731a5

Change-Id: I3e302e74d090485c179381a085d39d17bc212d67
2016-08-08 23:57:05 +00:00
Adam Seaton
68870731a5 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e
am: e158db8ad2

Change-Id: I61ddf7619069a6dc3bb10a70c6eca4d55a33c3fe
2016-08-08 23:54:05 +00:00
Adam Seaton
e158db8ad2 Update Security String to 2016-09-07 to platform and CTS for September respin
am: a53b868e6e

Change-Id: I0655a62b517357f75022f902d26b44a5c8aeaf85
2016-08-08 23:48:10 +00:00
Adam Seaton
a53b868e6e Update Security String to 2016-09-07 to platform and CTS for September
respin

Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
2016-08-08 15:08:45 -07:00
Dan Willemsen
dc1ddfcf3c 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
2016-08-05 17:26:28 -07:00
Andriy Naborskyy
5310557e3a board-specific prep recovery imagefix recovery size issue
Allow device config provide extra steps when preparing recovery
For example: have limited space in recovery partition and
need remove /sbin binaries that are not used in recovery mode

Bug: 30304868
Change-Id: I3890b635f4625e6e39d52ca326f92206641bbea7
2016-08-02 20:49:25 -07:00
Adam Seaton
8d4fac76b5 Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH
Change-Id: Id4eeaedac02900df7e635f378b54c2e58e9b5c6e
2016-07-29 11:52:35 -07:00
Dan Willemsen
f23e6bfda0 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
2016-07-28 23:16:45 +00:00
Adam Seaton
bddec86ed9 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
2016-07-28 22:34:12 +00:00
Adam Seaton
f25aadc812 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
2016-07-28 22:31:08 +00:00
Adam Seaton
8736caaba9 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
2016-07-28 22:28:42 +00:00
Adam Seaton
04fe21c7b7 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
2016-07-28 22:25:41 +00:00
Adam Seaton
63ec9d8f23 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
2016-07-28 22:23:40 +00:00
Adam Seaton
525c6aa541 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
2016-07-28 21:21:06 +00:00
Zach Jang
a212b9c250 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
2016-07-21 15:27:58 +00:00
Zach Jang
37c17db1c6 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
2016-07-21 15:21:00 +00:00
Zach Jang
bf8d3a2105 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
2016-07-20 18:20:19 +00:00
Zach Jang
37688e09fb 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
2016-07-20 18:17:18 +00:00
Zach Jang
942c341ab1 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
2016-07-20 18:14:48 +00:00
Zach Jang
ee6b57f523 Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
b/30224278

Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
2016-07-20 11:06:19 -07:00
Claes Elgemark
96e784eb4a DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data. am: 687c266053
am: 160e0054dd

Change-Id: I9851d5d1fc397191a35b6ab85cdf66b5bd222ff7
2016-07-20 17:47:41 +00:00
Claes Elgemark
160e0054dd DO NOT MERGE Strip path from verity_signer_cmd in the target-files meta data.
am: 687c266053

Change-Id: I5531a0fa456311f2a4824c7a9cdb5e3f43461da0
2016-07-20 17:44:42 +00:00
Claes Elgemark
687c266053 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 ec99604b07)
2016-07-20 10:30:03 -07:00
Kirill Grouchnikov
3f06eba6ea Rename the source of core-utils module to core-utils
Change-Id: Ia2db5386ca0048ed70a310a9b13e074d2fedd0a7
(cherry picked from commit 73b833b6a5d9b03c460ec61c5d781c032d6dbe1f)
2016-07-18 21:16:54 +00:00
Ian Pedowitz
14c2a1586b Merge "Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""" into nyc-mr1-dev 2016-07-06 18:46:24 +00:00
Ian Pedowitz
3b54683924 Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""
This reverts commit 266600b639.

Bug: 29117805
Change-Id: Idfc80ee1a91f76088c59a2ebe29a3d96bf02bf03
2016-07-05 18:25:14 +00:00
Alan Viverette
d2fc8094b1 Update pathmap.mk for refactored support library
Fix build following fast-forward of support library branch.

Change-Id: Ib9701b6f31f5b4a18067380875b145d990a07dd3
2016-07-02 19:40:37 -04:00
Michael Wright
bcdc880ca9 N MR1 is API 25
Bug: 29816674
Change-Id: Iaaf6de5e99cf21b489afe677a8bf8b5385d9ca6e
2016-07-01 14:42:44 +01:00
Andreas Gampe
5ed27e2d2f Build: Fix vendor sanitizer library for secondary arch
Fix the directory for secondary-architecture libraries under
sanitization. These incorrectly wrote into vendor/lib instead
of data/vendor/lib.

Bug: 29498013

(cherry picked from commit cf6268f471)

Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f
2016-06-30 20:49:55 -07:00
Alex Light
3f7c34859e Merge "Add system_other partition, install odex files" into nyc-mr1-dev 2016-06-29 20:26:06 +00:00
TreeHugger Robot
bfbcc0e954 Merge "Extract prebuilt APKs from zip files" into nyc-mr1-dev 2016-06-29 20:25:43 +00:00
Badhri Jagan Sridharan
00046ad56e Merge "Add build variant to kernel command line" into nyc-mr1-dev 2016-06-28 21:30:14 +00:00
Allen Hair
49fd8a24f3 Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am: 1f44c26b1e

Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216
2016-06-28 17:53:00 +00:00
Allen Hair
1f44c26b1e Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev 2016-06-28 17:45:17 +00:00
Allen Hair
ca96e25c5b DO NOT MERGE Skip emma instrumentation if we're using jack.
Bug: 29777843
Change-Id: I09071ef08e0b2fe64a78cfd6d81c73aa9b80967f
2016-06-27 17:21:48 -07:00