Jakub Adámek
84973f87e6
Merge "Install runtime resource overlay without subdir." into cw-f-dev
2016-10-05 19:57:22 +00:00
Dan Willemsen
73cead3e89
Package up proguard jack_dictionary
...
am: ea99c1da30
Change-Id: If2abc83918a7e1e229ff5233f7d49416d082a663
2016-10-05 17:22:34 +00:00
Jakub Adamek
a08a1015bc
Install runtime resource overlay without subdir.
...
Runtime resource overlay is a bare APK with just the overlaid
resources. There is no need for additional subdir.
See http://go/sku-colors .
Bug: 31692079
Change-Id: Iff3d58f941e764a7be3ec04cafeefd592bd8b944
2016-10-05 10:03:28 +01:00
Dan Willemsen
ea99c1da30
Package up proguard jack_dictionary
...
Bug: 31182185
Bug: 31240674
Test: m dist in an unbundled branch
(cherry picked from commit b6c061e9ff
)
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af
2016-10-05 01:36:58 +00:00
Dan Willemsen
932a406948
Support dist-ing the userdatatarball
...
am: bee409ba50
Change-Id: I659273a8d5f085ca1f3e5291b028847ee58665d4
2016-10-04 17:37:25 +00:00
Dan Willemsen
bee409ba50
Support dist-ing the userdatatarball
...
So that we can get to the contents of userdata from the build server
without extracting the image.
Bug: 27719200
Test: m userdatatarball dist
(cherry-picked from 69af2e4102
)
Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
2016-10-04 15:49:34 +00:00
Akshay Thakker
d634094543
Set N-MR1 to version 7.1.1.
...
N-MR1 is based on NDR. It has the same API level (25) but includes a few
more bug fixes and is going out to all devices. Hence 7.1.1.
Bug: 31859390
Change-Id: Iaf864b183e90e1ee1503e24cc99ead504c67f147
2016-09-30 20:01:19 +00:00
Adam Seaton
40365595b2
Updating security string to 2016-11-05 on nyc-dev am: 002132648d
am: a6071948d8
...
am: a947d89f1d
Change-Id: I58cc080f9cbba79d25e280e81e92dbcda66932eb
2016-09-21 17:59:41 +00:00
Adam Seaton
35eba634c3
Updating Security String to 2016-11-01 on nyc-dev am: 2a00b24144
am: 7d01908b3b
...
am: 8bd50bc352
Change-Id: I8249d2ab2419f53e3ef6e3fdb1c339eaed599f2c
2016-09-21 17:59:28 +00:00
Adam Seaton
a947d89f1d
Updating security string to 2016-11-05 on nyc-dev am: 002132648d
...
am: a6071948d8
Change-Id: Ibc68e2151af405be2dbc289001120cf58581ca85
2016-09-21 17:57:11 +00:00
Adam Seaton
8bd50bc352
Updating Security String to 2016-11-01 on nyc-dev am: 2a00b24144
...
am: 7d01908b3b
Change-Id: Id8ef2a01e23440ced1cfd8f91f78dabee4f7ad7b
2016-09-21 17:56:57 +00:00
Adam Seaton
a6071948d8
Updating security string to 2016-11-05 on nyc-dev
...
am: 002132648d
Change-Id: I35cd90ba6f03e44b7a0197c557c5a348eb013620
2016-09-21 17:55:12 +00:00
Adam Seaton
7d01908b3b
Updating Security String to 2016-11-01 on nyc-dev
...
am: 2a00b24144
Change-Id: Iaec891cdaecc040a815e89c3e33623b21e12100b
2016-09-21 17:51:41 +00:00
Adam Seaton
002132648d
Updating security string to 2016-11-05 on nyc-dev
...
b/31618336
Change-Id: I1489eaf64c59dc0f175eb9220a900c68e262b3dd
2016-09-20 15:48:41 -07:00
Adam Seaton
2a00b24144
Updating Security String to 2016-11-01 on nyc-dev
...
b/31618336
Change-Id: I8ee8f978fbbf30efb1abca85cf374fc440a1baf7
2016-09-20 15:47:16 -07:00
Dan Willemsen
fc143d474e
Clean up vendor image handling - DO NOT MERGE am: baacc3a7e8
...
am: 5183cdc3ac
Change-Id: I4023510ce2ab7bd51d2f2f7e2a1ffb311c26d17d
2016-09-20 18:25:08 +00:00
Dan Willemsen
5183cdc3ac
Clean up vendor image handling - DO NOT MERGE
...
am: baacc3a7e8
Change-Id: I6201601cca33fdde4b982fab7cb8bba8d4c6eaf5
2016-09-20 18:21:43 +00:00
Dan Willemsen
baacc3a7e8
Clean up vendor image handling - DO NOT MERGE
...
Standardize symlinking /system/vendor -> /vendor for aosp_* devices,
since some /vendor binaries still use /system/vendor/... paths.
Support using a prebuilt vendor image and including it into all the
normal packaging steps.
Bug: 31545062
Bug: 28987532
Change-Id: I27040e8a8d1df0777e16cd1e3c3a9f1b28695e96
2016-09-20 09:45:38 -07:00
Alan Viverette
ec58ebb4ee
Add transition support library to docs path to fix build
...
am: 9c535433df
Change-Id: I432a666e4a1c8d62ec5bb7414f2b2c90efd79892
2016-09-13 02:22:17 +00:00
Alan Viverette
9c535433df
Add transition support library to docs path to fix build
...
Change-Id: I277df6af728aea4aaa5b10605cf2a6a44c2a246f
2016-09-09 16:39:18 -04:00
Adam Seaton
78fb4b616f
Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091 am: c63e4295ef
am: 89c03f5748
...
am: 57866742e7
Change-Id: I378f4a0494c2b067d41676becf35663d9155cb1f
2016-08-26 03:16:47 +00:00
Adam Seaton
89c03f5748
Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091
...
am: c63e4295ef
Change-Id: I9cb5cbb053ebb79b08a0d75bff21932bb8eaee33
2016-08-26 03:11:47 +00:00
Adam Seaton
c63e4295ef
Update comments around PLATFORM_SECURITY_LEVEL
...
(nyc-dev)
Bug: 29881091
Change-Id: I2bdaf7f796ab94b14416aaed6d68dc3a239ea5f9
2016-08-25 19:46:06 -07:00
Alistair Strachan
7390ef5553
Avoid accidentally using the host's native 'as' command.
...
When invoking clang for the host to assemble .S files, the -B flag
would not be provided, which allowed the host prebuilt clang to
use an 'as' from the native environment. Most of the time this
"just works", but some newer 'as' versions cause problems with
the older prebuilt toolchain, for example by generating
unsupported relocation types.
To avoid this problem, simply use the -B flag to tell clang to
invoke the assembler from the correct prebuilt gcc prefix.
(cherry-picked from AOSP commit 5ff9c81b6c
)
Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342
Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com >
2016-08-22 19:39:25 -07:00
Adam Seaton
6e4a224227
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9
am: eacfc7749b
am: b93fd61d88
am: 35e3465433
...
am: 68fede2142
Change-Id: I7c479cc20694085d70c6c6f6840e0ddc6f16fdc0
2016-08-18 23:05:25 +00:00
Adam Seaton
4249783848
Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb
am: e977aadfea
am: 95e55dce44
am: 7d5d729831
...
am: 5d6ad4a9ab
Change-Id: I4e854f70d52f87cb809c59c6d73b4f5084bdba87
2016-08-18 23:05:24 +00:00
Adam Seaton
7d33fae097
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9
am: eacfc7749b
am: b93fd61d88
am: 35e3465433
...
am: 68fede2142
Change-Id: Ifc920c16d87b0076acefd8ce7aedb3ded831e633
2016-08-18 22:17:58 +00:00
Adam Seaton
68fede2142
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9
am: eacfc7749b
am: b93fd61d88
...
am: 35e3465433
Change-Id: Ie52eeb02bdfa1f17f3f584ec7fd03c274008037f
2016-08-18 22:14:18 +00:00
Adam Seaton
35e3465433
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9
am: eacfc7749b
...
am: b93fd61d88
Change-Id: I759c475cf971ef5eff39a12b11277338c4823696
2016-08-18 22:10:48 +00:00
Adam Seaton
b93fd61d88
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9
...
am: eacfc7749b
Change-Id: If1da1eb56de73999837f681443e0722b3edd5ee4
2016-08-18 22:07:48 +00:00
Adam Seaton
eacfc7749b
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)
...
am: bb45bd20e9
Change-Id: I72826f39c7c5db303106694fd41927e09f1c86d7
2016-08-18 22:04:24 +00:00
Adam Seaton
234787512c
Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb
am: e977aadfea
am: 95e55dce44
am: 7d5d729831
...
am: 5d6ad4a9ab
Change-Id: Ia74f7c457ab2b8df376a4501713243cd8506140a
2016-08-18 21:19:13 +00:00
Adam Seaton
5d6ad4a9ab
Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb
am: e977aadfea
am: 95e55dce44
...
am: 7d5d729831
Change-Id: Id24a8f9d8ae01587fd402839a41b6205efa4352e
2016-08-18 21:12:43 +00:00
Adam Seaton
bb45bd20e9
Update Security String to 2016-10-05 to Platform and CTS for October
...
Security Updates (rebased)
b/30946906
Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d
2016-08-18 14:11:04 -07:00
Adam Seaton
7d5d729831
Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb
am: e977aadfea
...
am: 95e55dce44
Change-Id: I379e5cc3ed69561d7bb22d866af2803cb28b0060
2016-08-18 21:09:12 +00:00
Adam Seaton
95e55dce44
Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb
...
am: e977aadfea
Change-Id: I74de2d5d5b8317805eddb5ce2fd0430c504c4dd1
2016-08-18 21:05:12 +00:00
Adam Seaton
e977aadfea
Update Security String to 2016-10-01 to platform and CTS for October Security
...
am: cb60b2dedb
Change-Id: Ibab3f4e47e05a2ec708105ddc3824df83ea95458
2016-08-18 21:01:43 +00:00
Adam Seaton
cb60b2dedb
Update Security String to 2016-10-01 to platform and CTS for October Security
...
Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684
2016-08-18 17:39:31 +00:00
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