Commit Graph
25 Commits
Author SHA1 Message Date
Alex Deymoandandroid-build-merger de36f5ed6b Add inttypes.h for PRIu64. am: 53c107f068 am: 0d345b6731
am: 30f1ad1169

Change-Id: Ia3ea7a02b91cb7d99340886639f496a22c50886f
2016-08-12 22:50:46 +00:00
Alex Deymoandandroid-build-merger 30f1ad1169 Add inttypes.h for PRIu64. am: 53c107f068
am: 0d345b6731

Change-Id: Idaa1aaeac69c91474500d093322ecf01ab6a49eb
2016-08-12 22:19:39 +00:00
Alex Deymoandandroid-build-merger 0d345b6731 Add inttypes.h for PRIu64.
am: 53c107f068

Change-Id: I2c84d557d7ee32508eded49b2061bf80fecc35ae
2016-08-12 22:11:47 +00:00
Alex Deymoandandroid-build-merger 35df4f7ced Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aosp
am: 567a7326c2

Change-Id: Ie3987944e259dea1d9a154fe7412fc81d382d158
2016-08-12 21:54:24 +00:00
Alex Deymoandandroid-build-merger 25c2f02cb5 Add inttypes.h for PRIu64.
am: 4e29ce0b88

Change-Id: I48a4b0aba107f81fd5ea59b76c7fc658df30c3b0
2016-08-12 21:54:23 +00:00
Alex DeymoandAndroid (Google) Code Review 567a7326c2 Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aosp 2016-08-12 21:38:21 +00:00
Alex Deymo 4e29ce0b88 Add inttypes.h for PRIu64.
This missing header is needed to use PRIu64 macros.

Bug: 27178350
TEST=`mma bootable/recovery` on the failing branch.

Change-Id: I165701e8019256426d3f6a4168db52c6a0197c4d
2016-08-12 21:20:45 +00:00
Alex Deymo 53c107f068 Add inttypes.h for PRIu64.
This missing header is needed to use PRIu64 macros.

Bug: 27178350
TEST=`mma bootable/recovery` on the failing branch.

Change-Id: I165701e8019256426d3f6a4168db52c6a0197c4d
2016-08-12 13:46:17 -07:00
Alex Deymoandandroid-build-merger 606724d7ad resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp
am: 9eaffca358

Change-Id: I10332a4634111b6a3cd39ef65e9b0d9392f95d64
2016-08-12 19:23:47 +00:00
Alex Deymo 9eaffca358 resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp
Change-Id: Icd879395a88ff1de0fcf0c754c0633d8fb6cf208
2016-08-12 11:21:43 -07:00
Alex Deymoandandroid-build-merger 66940b9f33 Call update_engine_sideload from recovery.
am: 4344d636d4

Change-Id: Ic9586cb3176bf608d2044e37b89e570c71130dcc
2016-08-12 18:06:56 +00:00
Alex Deymo 4344d636d4 Call update_engine_sideload from recovery.
This patch enables sideloading an OTA on A/B devices while running from
recovery. Recovery accepts the same OTA package format as recent
versions of GMS, which consists of .zip file with the payload in it.

Bug: 27178350
TEST=`adb sideload` successfully a full OTA (*)
TEST=Failed to take several invalid payloads (wrong product,
fingerprint, update type, serial, etc).

<small>(*) with no postinstall script.</small>

Change-Id: I951869340100feb5a37e41fac0ee59c10095659e
2016-08-11 18:55:11 -07:00
Alex Deymoandandroid-build-merger 3934e1228a Merge "Add include/ to the Makefile include path." am: 38234f4bef
am: 1b688e8039

* commit '1b688e8039a26b7deb9217487f99136d2afcc688':
  Add include/ to the Makefile include path.
2016-03-14 21:56:57 +00:00
Alex Deymoandandroid-build-merger 1b688e8039 Merge "Add include/ to the Makefile include path."
am: 38234f4bef

* commit '38234f4bef8b70d985c09224e6d7752d71400f23':
  Add include/ to the Makefile include path.
2016-03-14 21:52:51 +00:00
Alex DeymoandGerrit Code Review 38234f4bef Merge "Add include/ to the Makefile include path." 2016-03-14 21:48:52 +00:00
Alex Deymo 82f8c82046 Add include/ to the Makefile include path.
The applypatch heaaders were recently moved to the include/ directory.
This patch reflects that change in the Makefile.

Bug: None
TEST=sudo emerge imgdiff

Change-Id: I0bf3f991b5e0c98054033c5939ed69b3e3c827a9
2016-03-14 14:25:33 -07:00
Alex Deymoandandroid-build-merger 8ab23ef210 Merge "Restore labels on /postinstall during recovery." into nyc-dev am: 1731f2980b
am: a1ccc83c8b

* commit 'a1ccc83c8beb0a99b0453104deb6538c163a445f':
  Restore labels on /postinstall during recovery.
2016-03-05 00:09:37 +00:00
Alex Deymoandandroid-build-merger a1ccc83c8b Merge "Restore labels on /postinstall during recovery." into nyc-dev
am: 1731f2980b

* commit '1731f2980bfadb29105ffd566dd78885889501d8':
  Restore labels on /postinstall during recovery.
2016-03-05 00:07:37 +00:00
Alex DeymoandAndroid (Google) Code Review 1731f2980b Merge "Restore labels on /postinstall during recovery." into nyc-dev 2016-03-05 00:03:47 +00:00
Alex Deymo 080f522fb9 Restore labels on /postinstall during recovery.
This patch mirrors what was done in the main init.rc to relabel
/postinstall.

Bug: 27178350
Bug: 27177071

(cherry picked from commit 6bcc8af6e5)

Change-Id: I8320559f014cfb14216dcc350e016fc1db05cb14
2016-03-04 15:50:27 -08:00
Alex Deymoandandroid-build-merger 2bdef0937a Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6 am: f6ffefb116
am: 20bb31bbd3

* commit '20bb31bbd3a74667ff1da59ef4ead37d065dc80d':
  Restore labels on /postinstall during recovery.
2016-03-04 05:49:06 +00:00
Alex Deymoandandroid-build-merger 20bb31bbd3 Merge "Restore labels on /postinstall during recovery." am: 60eae72ac6
am: f6ffefb116

* commit 'f6ffefb11690ca3604df7c8c0ddda74387d26eba':
  Restore labels on /postinstall during recovery.
2016-03-04 05:47:16 +00:00
Alex Deymoandandroid-build-merger f6ffefb116 Merge "Restore labels on /postinstall during recovery."
am: 60eae72ac6

* commit '60eae72ac6c35567ea71035d379d4f2300cec77c':
  Restore labels on /postinstall during recovery.
2016-03-04 05:45:27 +00:00
Alex DeymoandGerrit Code Review 60eae72ac6 Merge "Restore labels on /postinstall during recovery." 2016-03-04 05:40:14 +00:00
Alex Deymo 6bcc8af6e5 Restore labels on /postinstall during recovery.
This patch mirrors what was done in the main init.rc to relabel
/postinstall.

Bug: 27178350
Bug: 27177071
Change-Id: I39cd03f3c55a42c03367957e8c259c9a3155203c
2016-03-02 14:35:51 -08:00