OSDN Git Service
Akshay Thakker [Wed, 5 Oct 2016 23:30:14 +0000 (23:30 +0000)]
Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev
am:
d22aeb6899
Change-Id: I6ddf3c8cfc55412458e8dc5720b44154278c9a4d
Akshay Thakker [Wed, 5 Oct 2016 23:23:37 +0000 (23:23 +0000)]
Set N-MR1 to version 7.1.1.
am:
d634094543
Change-Id: I2976fd1363597b632482de6c2f9cbdc4166c7a03
TreeHugger Robot [Wed, 5 Oct 2016 23:17:38 +0000 (23:17 +0000)]
Merge "Set N-MR1 to version 7.1.1." into nyc-mr1-dev
Jakub Adámek [Wed, 5 Oct 2016 19:57:22 +0000 (19:57 +0000)]
Merge "Install runtime resource overlay without subdir." into cw-f-dev
Dan Willemsen [Wed, 5 Oct 2016 17:22:34 +0000 (17:22 +0000)]
Package up proguard jack_dictionary
am:
ea99c1da30
Change-Id: If2abc83918a7e1e229ff5233f7d49416d082a663
Jakub Adamek [Mon, 3 Oct 2016 08:56:16 +0000 (09:56 +0100)]
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
Dan Willemsen [Thu, 1 Sep 2016 18:02:43 +0000 (11:02 -0700)]
Package up proguard jack_dictionary
Bug:
31182185
Bug:
31240674
Test: m dist in an unbundled branch
(cherry picked from commit
b6c061e9ffa5208b0b2dae0a5a88694925c6b527)
Change-Id: I7ee1ba076cfa03f294f8231f6bdd8fa8df5557af
Dan Willemsen [Tue, 4 Oct 2016 17:37:25 +0000 (17:37 +0000)]
Support dist-ing the userdatatarball
am:
bee409ba50
Change-Id: I659273a8d5f085ca1f3e5291b028847ee58665d4
Dan Willemsen [Tue, 16 Aug 2016 23:36:05 +0000 (16:36 -0700)]
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
69af2e4102d3af3f5f06e4d7a615d42dbb3446bb)
Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
Dirk Dougherty [Sat, 1 Oct 2016 01:19:00 +0000 (01:19 +0000)]
For ds builds only, emit a separate metadata file for samples only. am:
a9fcf48078 am:
fd40bbc586
am:
3d58e7f387
Change-Id: Iec35ec96194a76c67dec543cf28184f0d0c2e549
Dirk Dougherty [Sat, 1 Oct 2016 01:11:12 +0000 (01:11 +0000)]
For ds builds only, emit a separate metadata file for samples only. am:
a9fcf48078
am:
fd40bbc586
Change-Id: I97c8ecb583d951752218b94dcc88c3f81cf548cd
Dirk Dougherty [Sat, 1 Oct 2016 01:07:41 +0000 (01:07 +0000)]
For ds builds only, emit a separate metadata file for samples only.
am:
a9fcf48078
Change-Id: I1795160d80b1038ffe30758ce6fc4cd48d3bda2a
Dirk Dougherty [Sat, 24 Sep 2016 20:39:16 +0000 (13:39 -0700)]
For ds builds only, emit a separate metadata file for samples only.
Change-Id: I95c03a10cca586c6675f98664479ba8bf2e43576
Akshay Thakker [Fri, 30 Sep 2016 19:44:58 +0000 (12:44 -0700)]
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
Adam Seaton [Wed, 28 Sep 2016 23:56:57 +0000 (23:56 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072 am:
bf456ce691 am:
c66709e250 am:
eabbc11dac
am:
394df97f66
Change-Id: I430746aa4183ad783b206f8d67c93de9b65030de
Adam Seaton [Wed, 28 Sep 2016 23:53:42 +0000 (23:53 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072 am:
bf456ce691 am:
c66709e250
am:
eabbc11dac
Change-Id: I7386dde56d4eb7069faff4698dd2e41ba03a9973
Adam Seaton [Wed, 28 Sep 2016 23:50:42 +0000 (23:50 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072 am:
bf456ce691
am:
c66709e250
Change-Id: I69026b9dea389aaf3a81119caaf67f0e1e9e6aeb
Adam Seaton [Wed, 28 Sep 2016 23:47:43 +0000 (23:47 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61 am:
b29e4b5072
am:
bf456ce691
Change-Id: I322af25b017e60b81202de28ee03ec0657e4db61
Adam Seaton [Wed, 28 Sep 2016 23:44:12 +0000 (23:44 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398 am:
bbde7f4d61
am:
b29e4b5072
Change-Id: Ic2e3c2cae87d0ef219c57ec45fe953ab89a92a27
Adam Seaton [Wed, 28 Sep 2016 23:41:12 +0000 (23:41 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours am:
f34934a398
am:
bbde7f4d61
Change-Id: I2cd175f60442ff8359e17e5a5d6b12407fc0ee93
Adam Seaton [Wed, 28 Sep 2016 23:38:12 +0000 (23:38 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11 am:
e38c8eff17 -s ours
am:
f34934a398
Change-Id: Id21149fb75f586dbd8a5bd25eadaf0c76699bd50
Adam Seaton [Wed, 28 Sep 2016 23:35:12 +0000 (23:35 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b am:
19f744cb11
am:
e38c8eff17 -s ours
Change-Id: Ie6a3cba97e517bbe4e0e2d3154523dbe8c28ba9d
Tao Bao [Wed, 28 Sep 2016 19:37:54 +0000 (19:37 +0000)]
Analyze unchanged blocks in odex files.
am:
d0814585b8
Change-Id: Ie4d6415d4d3ebc1e28a299bd3bb0150262a07535
Tao Bao [Tue, 20 Sep 2016 05:26:30 +0000 (22:26 -0700)]
Analyze unchanged blocks in odex files.
In BBOTA, we generate patches based on _all_ the blocks of a pair of
input files (src and tgt). For security incremental OTAs, one common
pattern is that only a few blocks are changed in odex files (e.g.
headers). We don't really need to stash/patch the unchanged blocks.
This CL analyzes the unchanged blocks in odex files and computes the
diff for the changed blocks only. It reduces the OTA install time by
about 25% to 40% in our experiments, by paying an increase of 5% to 30%
OTA generation time cost.
Bug:
31570716
Test: Generate an incremental and apply on device.
Change-Id: If842c1afeff6894a3d27eb60b7e8f65a179b7977
(cherry picked from commit
08c8583aea0c53a7cee840d627371314654895e8)
Przemyslaw Szczepaniak [Tue, 27 Sep 2016 09:16:41 +0000 (09:16 +0000)]
Fix for non-empty a[name] tags in openJdk based javadocs. am:
a7edd92c45 am:
ea14cfba0f
am:
6169f2b065
Change-Id: I328b66a8a08126baeaa38a66d888dcf0521c6976
Przemyslaw Szczepaniak [Tue, 27 Sep 2016 09:13:40 +0000 (09:13 +0000)]
Fix for non-empty a[name] tags in openJdk based javadocs. am:
a7edd92c45
am:
ea14cfba0f
Change-Id: Ida650d1d4f8afc8eb05c1df4109fcb4f0ca5dbb1
Przemyslaw Szczepaniak [Tue, 27 Sep 2016 09:11:55 +0000 (09:11 +0000)]
Fix for non-empty a[name] tags in openJdk based javadocs.
am:
a7edd92c45
Change-Id: I5759d442e038f31105c249250ce3474564d7954c
Przemyslaw Szczepaniak [Mon, 26 Sep 2016 15:21:13 +0000 (16:21 +0100)]
Fix for non-empty a[name] tags in openJdk based javadocs.
openJdk based android javadoc contains <a name=... tags
that are non-empty. Currently they are being hidden,
causing badly formatted pages for some java.* classes
(missing text and random whitespace blocks).
This change makes the existing a[name] hiding rule
apply only to empty tags.
Test: make docs
Bug:
31700998
Change-Id: Ifa75bbabe308d7aed0cce6165c1113e5a382a121
Adam Seaton [Fri, 23 Sep 2016 21:42:12 +0000 (21:42 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4 am:
34a991851b
am:
19f744cb11
Change-Id: I27a1788567a70e80185ac90eb5c787f2a611ebae
Adam Seaton [Fri, 23 Sep 2016 21:38:43 +0000 (21:38 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313 am:
b6621dcce4
am:
34a991851b
Change-Id: I87c80e08a201ae4b5e39b1f86810b45e5c0dca6f
Adam Seaton [Fri, 23 Sep 2016 21:36:42 +0000 (21:36 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc am:
b404280313
am:
b6621dcce4
Change-Id: I30d82900a829b6eb86419db32c22da1dc435d1a6
Adam Seaton [Fri, 23 Sep 2016 21:34:42 +0000 (21:34 +0000)]
Update Security String to 2016-11-05 on klp-dev am:
5ecba8e0cc
am:
b404280313
Change-Id: I98abad9af83a371a3e0b7916397f5a44e255b0f9
Adam Seaton [Fri, 23 Sep 2016 21:32:42 +0000 (21:32 +0000)]
Update Security String to 2016-11-05 on klp-dev
am:
5ecba8e0cc
Change-Id: I915af51aaa29f29fabcffe2729ab04cd73cd76cd
Dirk Dougherty [Thu, 22 Sep 2016 22:25:38 +0000 (22:25 +0000)]
Support "ID" lang code in place of "IN". am:
fc61720cd5 am:
1e3157760a
am:
4f4060398b
Change-Id: Ibbf7dae4de81f65b4caa9f433be5f144d251c449
Dirk Dougherty [Thu, 22 Sep 2016 22:00:32 +0000 (22:00 +0000)]
Support "ID" lang code in place of "IN". am:
fc61720cd5
am:
1e3157760a
Change-Id: I3c4a30979509fe8ddd2f9ca1e22834bf03add68e
Dirk Dougherty [Thu, 22 Sep 2016 21:54:37 +0000 (21:54 +0000)]
Support "ID" lang code in place of "IN".
am:
fc61720cd5
Change-Id: If9670423332a3c785cc7b7ddc5e53b524f9e4e7d
Dirk Dougherty [Thu, 22 Sep 2016 01:29:18 +0000 (18:29 -0700)]
Support "ID" lang code in place of "IN".
Change-Id: I56632e638fdda81e494cbb7080502b35393a291f
Adam Seaton [Wed, 21 Sep 2016 18:33:04 +0000 (18:33 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405 am:
ceda55a70c am:
b1c348827f
am:
514aa651e8
Change-Id: I0d500037f2bfbddfd415bccdda6d72757cf1aebc
Adam Seaton [Wed, 21 Sep 2016 18:32:05 +0000 (18:32 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405 am:
ceda55a70c
am:
b1c348827f
Change-Id: Ia8343fb817b7cd07399c41dd702bc83c042e0336
Adam Seaton [Wed, 21 Sep 2016 18:32:05 +0000 (18:32 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe am:
7bdb62e453 am:
f48e1e6cb3
am:
1cfca4d3e3
Change-Id: I72374aea3766e30c3f56d9ea2698c56aac397410
Adam Seaton [Wed, 21 Sep 2016 18:28:15 +0000 (18:28 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe am:
7bdb62e453
am:
f48e1e6cb3
Change-Id: I5842754fd4ae0fe88e86935510b101b92d65547f
Adam Seaton [Wed, 21 Sep 2016 18:27:04 +0000 (18:27 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b am:
5fd0f92405
am:
ceda55a70c
Change-Id: I2fdef44649c093e248976cb1a99bf08dcec4bf90
Adam Seaton [Wed, 21 Sep 2016 18:24:04 +0000 (18:24 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327 am:
5673cc319b
am:
5fd0f92405
Change-Id: I673419ace743bdffeb04f671f25a0d8f43594925
Adam Seaton [Wed, 21 Sep 2016 18:24:04 +0000 (18:24 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db am:
0ea40f86fe
am:
7bdb62e453
Change-Id: Ibdff0bc717c5da544cf1303c366d9c0187b95f30
Adam Seaton [Wed, 21 Sep 2016 18:22:04 +0000 (18:22 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787 am:
a97cf974db
am:
0ea40f86fe
Change-Id: I85ff5b04c174b94b4be19f5ba6b3f1ae7c525932
Adam Seaton [Wed, 21 Sep 2016 18:22:03 +0000 (18:22 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796 am:
e8e35c0327
am:
5673cc319b
Change-Id: I3c89353174d4c1033e1d8e4935217c888ee0a859
Adam Seaton [Wed, 21 Sep 2016 18:19:32 +0000 (18:19 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2 am:
a983e8e796
am:
e8e35c0327
Change-Id: I62c5f469c38faf8565656ac6bf436e20454220dc
Adam Seaton [Wed, 21 Sep 2016 18:19:32 +0000 (18:19 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13 am:
e63569c787
am:
a97cf974db
Change-Id: Ia7d56ec19a0c1a9222eaaaae653bd5b9d3554ca7
Adam Seaton [Wed, 21 Sep 2016 18:17:02 +0000 (18:17 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d am:
3ffb2d23c2
am:
a983e8e796
Change-Id: Iad93276510ea4f7742b91e9ca5bfeb7967f53294
Adam Seaton [Wed, 21 Sep 2016 18:17:02 +0000 (18:17 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours am:
9655ec5d13
am:
e63569c787
Change-Id: If7985374a54fe95592303ee6a81f55c0be9f1b11
Adam Seaton [Wed, 21 Sep 2016 18:14:48 +0000 (18:14 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8 am:
25019ad31d
am:
3ffb2d23c2
Change-Id: Id10071c0a2209df3cd0b8232b9713f7e29536d55
Adam Seaton [Wed, 21 Sep 2016 18:14:47 +0000 (18:14 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5 am:
595661f7cb -s ours
am:
9655ec5d13
Change-Id: I10b3ed85f30b7080e4f98b12597962fb593eec2e
Adam Seaton [Wed, 21 Sep 2016 18:12:02 +0000 (18:12 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68 am:
e13d8888a8
am:
25019ad31d
Change-Id: I547d3e7830f4815f0483c236192bd099bef5cc18
Adam Seaton [Wed, 21 Sep 2016 18:12:00 +0000 (18:12 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272 am:
c184e47cc5
am:
595661f7cb -s ours
Change-Id: Idf6bdb2bc18328522a49974cc52db13b92fc54ea
Adam Seaton [Wed, 21 Sep 2016 18:09:31 +0000 (18:09 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2 am:
57370e1f68
am:
e13d8888a8
Change-Id: I996544a25a9f2c8749039885ce28dfe25c86008f
Adam Seaton [Wed, 21 Sep 2016 18:07:00 +0000 (18:07 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1 am:
0f9242c4d2
am:
57370e1f68
Change-Id: I38ac268882f035cb3ede21264dc09cb7636b2e6d
Adam Seaton [Wed, 21 Sep 2016 18:07:00 +0000 (18:07 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b am:
d7ae210272
am:
c184e47cc5
Change-Id: I262c282ff61013c546b70ce4b026ab8f1f074488
Adam Seaton [Wed, 21 Sep 2016 18:04:29 +0000 (18:04 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1 am:
fcc6e603c1
am:
0f9242c4d2
Change-Id: Ib0f308deca6d9cb6f25a8c0b2ad710676a936f49
Adam Seaton [Wed, 21 Sep 2016 18:04:29 +0000 (18:04 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e am:
dafa9bc77b
am:
d7ae210272
Change-Id: I03667caf5a56aad45375984eafd56520f1c4e881
Adam Seaton [Wed, 21 Sep 2016 18:03:00 +0000 (11:03 -0700)]
Update Security String to 2016-11-05 on klp-dev
b/
31618336
Change-Id: I55539e8d8c24f11b9743f3d40b689de7636ef40f
Adam Seaton [Wed, 21 Sep 2016 18:02:15 +0000 (18:02 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72 am:
4fd819741e
am:
dafa9bc77b
Change-Id: I84eb63c40130faa756e3de022de1a2c4467a6b85
Adam Seaton [Wed, 21 Sep 2016 18:01:58 +0000 (18:01 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev am:
e5ecc61cf1
am:
fcc6e603c1
Change-Id: I0f514c2c0eaaac94140b8cdc8407478abc606c35
Adam Seaton [Wed, 21 Sep 2016 17:59:49 +0000 (17:59 +0000)]
Merge changes I1489eaf6,I8ee8f978 into nyc-dev am:
575add3bcf am:
7706e91d8f
am:
a871b53ff3
Change-Id: I7378a18b0dfa4bfd09e3c0c7729e468f0340402a
Adam Seaton [Wed, 21 Sep 2016 17:59:41 +0000 (17:59 +0000)]
Updating security string to 2016-11-05 on nyc-dev am:
002132648d am:
a6071948d8
am:
a947d89f1d
Change-Id: I58cc080f9cbba79d25e280e81e92dbcda66932eb
Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev
am:
e5ecc61cf1
Change-Id: I6cabebaf6f5e39faf4bf0417eb7e88479d96947a
Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c am:
bf8a1cef72
am:
4fd819741e
Change-Id: I309c174e2924614dd3197f33eff36063e9acc21a
Adam Seaton [Wed, 21 Sep 2016 17:59:28 +0000 (17:59 +0000)]
Updating Security String to 2016-11-01 on nyc-dev am:
2a00b24144 am:
7d01908b3b
am:
8bd50bc352
Change-Id: I8249d2ab2419f53e3ef6e3fdb1c339eaed599f2c
Adam Seaton [Wed, 21 Sep 2016 17:57:17 +0000 (17:57 +0000)]
Merge changes I1489eaf6,I8ee8f978 into nyc-dev am:
575add3bcf
am:
7706e91d8f
Change-Id: I046a6fd53782e965e39a5a43ab0ea151794a1aeb
Adam Seaton [Wed, 21 Sep 2016 17:57:11 +0000 (17:57 +0000)]
Updating security string to 2016-11-05 on nyc-dev am:
002132648d
am:
a6071948d8
Change-Id: Ibc68e2151af405be2dbc289001120cf58581ca85
Adam Seaton [Wed, 21 Sep 2016 17:56:59 +0000 (17:56 +0000)]
Update Security String to 2016-11-01 b/
31618336 am:
2a03720e6c
am:
bf8a1cef72
Change-Id: I9f4709ddb9a9aec34efa4134d9cf652d8de81177
Adam Seaton [Wed, 21 Sep 2016 17:56:57 +0000 (17:56 +0000)]
Updating Security String to 2016-11-01 on nyc-dev am:
2a00b24144
am:
7d01908b3b
Change-Id: Id8ef2a01e23440ced1cfd8f91f78dabee4f7ad7b
Adam Seaton [Wed, 21 Sep 2016 17:55:13 +0000 (17:55 +0000)]
Merge changes I1489eaf6,I8ee8f978 into nyc-dev
am:
575add3bcf
Change-Id: Ife706192b6acf1bf2d76b5c0f866ae7d417027d7
Adam Seaton [Wed, 21 Sep 2016 17:55:12 +0000 (17:55 +0000)]
Updating security string to 2016-11-05 on nyc-dev
am:
002132648d
Change-Id: I35cd90ba6f03e44b7a0197c557c5a348eb013620
Adam Seaton [Wed, 21 Sep 2016 17:54:28 +0000 (17:54 +0000)]
Update Security String to 2016-11-01 b/
31618336
am:
2a03720e6c
Change-Id: I0991ac69c8effc6d263c051567b6111fd0416e65
Adam Seaton [Wed, 21 Sep 2016 17:51:41 +0000 (17:51 +0000)]
Updating Security String to 2016-11-01 on nyc-dev
am:
2a00b24144
Change-Id: Iaec891cdaecc040a815e89c3e33623b21e12100b
Adam Seaton [Wed, 21 Sep 2016 17:50:21 +0000 (17:50 +0000)]
Merge "Update Security String to 2016-11-01 b/
31618336" into klp-dev
Adam Seaton [Wed, 21 Sep 2016 17:47:06 +0000 (17:47 +0000)]
Merge changes I1489eaf6,I8ee8f978 into nyc-dev
* changes:
Updating security string to 2016-11-05 on nyc-dev
Updating Security String to 2016-11-01 on nyc-dev
Adam Seaton [Tue, 20 Sep 2016 23:01:43 +0000 (23:01 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833 am:
fac5535f75 am:
405437474b am:
4afc7d56eb -s ours am:
1ddbc7984a am:
7f144ed805
am:
96b6c93f1e
Change-Id: Id3a4742f4934864d8c1eeb2a8a5943c5d1363ef1
Adam Seaton [Tue, 20 Sep 2016 22:58:44 +0000 (22:58 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833 am:
fac5535f75 am:
405437474b am:
4afc7d56eb -s ours am:
1ddbc7984a
am:
7f144ed805
Change-Id: I27ca0a0f9b2a5f7ecc3e09701f12121cfc1a937a
Adam Seaton [Tue, 20 Sep 2016 22:56:57 +0000 (22:56 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833 am:
fac5535f75 am:
405437474b am:
4afc7d56eb -s ours
am:
1ddbc7984a
Change-Id: Ib6d5bb3497d951a69f42df5d9660a8ff1b5258d1
Adam Seaton [Tue, 20 Sep 2016 22:56:14 +0000 (22:56 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba am:
f3b89d8392 am:
9ccd48f7d1 am:
8720071b96 -s ours am:
d5e90e9fa3 am:
9f95ef9fc9
am:
535efb4464
Change-Id: I7e3488e8996d7f82fd0d542127f8e990e8f17353
Adam Seaton [Tue, 20 Sep 2016 22:53:43 +0000 (22:53 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba am:
f3b89d8392 am:
9ccd48f7d1 am:
8720071b96 -s ours am:
d5e90e9fa3
am:
9f95ef9fc9
Change-Id: I067df69555121a39c44c1a0cca1d253f148aa0bc
Adam Seaton [Tue, 20 Sep 2016 22:53:42 +0000 (22:53 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833 am:
fac5535f75 am:
405437474b
am:
4afc7d56eb -s ours
Change-Id: I254e7b694e8be596854e15cdd56dc3f26794b3a0
Adam Seaton [Tue, 20 Sep 2016 22:51:12 +0000 (22:51 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba am:
f3b89d8392 am:
9ccd48f7d1 am:
8720071b96 -s ours
am:
d5e90e9fa3
Change-Id: I117a415131b8471eeac4c80a7a500f0f89d84fdf
Adam Seaton [Tue, 20 Sep 2016 22:48:41 +0000 (15:48 -0700)]
Updating security string to 2016-11-05 on nyc-dev
b/
31618336
Change-Id: I1489eaf64c59dc0f175eb9220a900c68e262b3dd
Adam Seaton [Tue, 20 Sep 2016 22:48:40 +0000 (22:48 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba am:
f3b89d8392 am:
9ccd48f7d1
am:
8720071b96 -s ours
Change-Id: If082fc1b10dcbe9cb83320d086a2f0c336171f0e
Adam Seaton [Tue, 20 Sep 2016 22:47:16 +0000 (15:47 -0700)]
Updating Security String to 2016-11-01 on nyc-dev
b/
31618336
Change-Id: I8ee8f978fbbf30efb1abca85cf374fc440a1baf7
Adam Seaton [Tue, 20 Sep 2016 22:38:43 +0000 (22:38 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833 am:
fac5535f75
am:
405437474b
Change-Id: Iefac549d3a988284b88653120c7469e278e95cd4
Adam Seaton [Tue, 20 Sep 2016 22:38:39 +0000 (22:38 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba am:
f3b89d8392
am:
9ccd48f7d1
Change-Id: I79e6fa0c2a6b026487bc1be8c51194ddd013f717
Adam Seaton [Tue, 20 Sep 2016 22:36:19 +0000 (22:36 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336 am:
dcfd738833
am:
fac5535f75
Change-Id: I8204ecf14fc6605265b46c28916eca6ede9858ae
Adam Seaton [Tue, 20 Sep 2016 22:36:09 +0000 (22:36 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336 am:
62b28398ba
am:
f3b89d8392
Change-Id: Ic3ad8fe00b74ab5b0ec7dc255366569e286565d8
Adam Seaton [Tue, 20 Sep 2016 22:33:15 +0000 (22:33 +0000)]
Updating Security String to 2016-11-05 on mnc-dev b/
31618336
am:
dcfd738833
Change-Id: I773c8e574286057cb8f33413c027276023fb32da
Adam Seaton [Tue, 20 Sep 2016 22:33:08 +0000 (22:33 +0000)]
Updating Security String to 2016-11-01 on mnc-dev b/
31618336
am:
62b28398ba
Change-Id: I97cbe642d516b08d52c08b4e93ee4090493b1b96
Dan Willemsen [Tue, 20 Sep 2016 18:25:08 +0000 (18:25 +0000)]
Clean up vendor image handling - DO NOT MERGE am:
baacc3a7e8
am:
5183cdc3ac
Change-Id: I4023510ce2ab7bd51d2f2f7e2a1ffb311c26d17d
Dan Willemsen [Tue, 20 Sep 2016 18:21:43 +0000 (18:21 +0000)]
Clean up vendor image handling - DO NOT MERGE
am:
baacc3a7e8
Change-Id: I6201601cca33fdde4b982fab7cb8bba8d4c6eaf5
Adam Seaton [Tue, 20 Sep 2016 17:06:50 +0000 (10:06 -0700)]
Updating Security String to 2016-11-05 on mnc-dev
b/
31618336
Change-Id: I3c9459553fdc89cacdf74d5e5801871b7192bc51
Adam Seaton [Tue, 20 Sep 2016 17:03:47 +0000 (10:03 -0700)]
Updating Security String to 2016-11-01 on mnc-dev
b/
31618336
Change-Id: I18b3a0d690ab238fcd3cafa65b873ce7432c9c25
Dan Willemsen [Fri, 17 Jun 2016 21:07:37 +0000 (14:07 -0700)]
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
Adam Seaton [Tue, 20 Sep 2016 16:34:22 +0000 (09:34 -0700)]
Update Security String to 2016-11-01
b/
31618336
Change-Id: Ib31ba11912f144ff34edb66dc693b92f6fc0c24b
bohu [Wed, 14 Sep 2016 23:32:29 +0000 (23:32 +0000)]
Emulator: increase x86_64 system image size to 2G
am:
67d789a9a5
Change-Id: Ic02d13cb6e01383297522a8948f60aaa1572137d