OSDN Git Service
Benoit Lamarche [Thu, 22 Sep 2016 22:17:50 +0000 (22:17 +0000)]
Merge changes from topic 'jack-d-b3-as-stable' am:
52eafee87a am:
95cea98863
am:
e1da6f7a87
Change-Id: Ic0bc8af24b37aed9f92fa785586820281126c95a
Yohann Roussel [Thu, 22 Sep 2016 22:14:47 +0000 (22:14 +0000)]
Fix bad JACK_PLUGIN variable am:
16243bdbec am:
fa887390aa
am:
cbe1913c78
Change-Id: I38a75ae28b9994832b5cfcfb053c67cd49ed834c
Yohann Roussel [Thu, 22 Sep 2016 22:14:39 +0000 (22:14 +0000)]
Add support for Jack plugin am:
53b7fbbe78 am:
be50693fc1
am:
62e67d1bff
Change-Id: I7cf2db9ccd9bfe03ec1394340b2683b014e7dde5
Benoit Lamarche [Thu, 22 Sep 2016 11:47:56 +0000 (11:47 +0000)]
Merge changes from topic 'jack-d-b3-as-stable' am:
52eafee87a
am:
95cea98863
Change-Id: I73136c06aafd0d57192c62a9eeb262de85e00121
Yohann Roussel [Thu, 22 Sep 2016 11:46:09 +0000 (11:46 +0000)]
Fix bad JACK_PLUGIN variable am:
16243bdbec
am:
fa887390aa
Change-Id: I50ffe581aa848fd1b1fe3109eacd19dce4049632
Yohann Roussel [Thu, 22 Sep 2016 11:46:01 +0000 (11:46 +0000)]
Add support for Jack plugin am:
53b7fbbe78
am:
be50693fc1
Change-Id: I67172f4e42cca74f793426912cc8b0ff036bf47c
Benoit Lamarche [Thu, 22 Sep 2016 09:43:29 +0000 (09:43 +0000)]
Merge changes from topic 'jack-d-b3-as-stable'
am:
52eafee87a
Change-Id: I7e4fb947fe8f2c5ea8d1091583c468f8c9ca3d35
Yohann Roussel [Thu, 22 Sep 2016 09:41:30 +0000 (09:41 +0000)]
Fix bad JACK_PLUGIN variable
am:
16243bdbec
Change-Id: Ic0c8dfc081ce1bc0a267474bf1ce7d3ca3dfbb03
Yohann Roussel [Thu, 22 Sep 2016 09:41:22 +0000 (09:41 +0000)]
Add support for Jack plugin
am:
53b7fbbe78
Change-Id: Idec54986c0afe10973c464c6edb533321441eea7
Benoit Lamarche [Thu, 22 Sep 2016 09:34:26 +0000 (09:34 +0000)]
Merge changes from topic 'jack-d-b3-as-stable'
* changes:
Fix bad JACK_PLUGIN variable
Add support for Jack plugin
Dan Willemsen [Wed, 21 Sep 2016 19:53:20 +0000 (19:53 +0000)]
Merge "Package up proguard jack_dictionary" am:
f7d1a6d75f am:
e875b39791
am:
f56a3b2513
Change-Id: Ide4c2d7d17adabdc8375f14d3676f1d6b8e455f4
Dan Willemsen [Wed, 21 Sep 2016 19:50:50 +0000 (19:50 +0000)]
Merge "Package up proguard jack_dictionary" am:
f7d1a6d75f
am:
e875b39791
Change-Id: Ibe68192917534f603872e698131534e55973edae
Dan Willemsen [Wed, 21 Sep 2016 19:48:20 +0000 (19:48 +0000)]
Merge "Package up proguard jack_dictionary"
am:
f7d1a6d75f
Change-Id: Ia426e7d0fea6d0c6fc610d9d9fed20c9d2159ed6
Dan Willemsen [Wed, 21 Sep 2016 19:39:47 +0000 (19:39 +0000)]
Merge "Package up proguard jack_dictionary"
Android Build Merger (Role) [Wed, 21 Sep 2016 18:34:56 +0000 (18:34 +0000)]
Merge "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 am:
3e206a84ff" into nyc-mr1-dev-plus-aosp
Adam Seaton [Wed, 21 Sep 2016 18:34:48 +0000 (18:34 +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
am:
3e206a84ff
Change-Id: I39dfe685fd744b270a13db3b92e94a7bc60874c0
Android Build Merger (Role) [Wed, 21 Sep 2016 18:34:44 +0000 (18:34 +0000)]
Adam Seaton [Wed, 21 Sep 2016 18:34:36 +0000 (18:34 +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
am:
7d285b4153
Change-Id: Ia0db1f3b79b44241784fd3ba73e96bf47628fc1a
Adam Seaton [Wed, 21 Sep 2016 18:34:35 +0000 (18:34 +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:
61ce7e2425
Change-Id: Ie625e9686515ed65fe6c0e351ce4e12e890b2b9e
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)]
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:
e8f26b5a83
Change-Id: I0fce7b685020eca0c73bbfdce0b7fa5989c87e10
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: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: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:42 +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: I85a55326c07e27a78e37dc91d4fde241abc8aa40
Adam Seaton [Wed, 21 Sep 2016 18:27:05 +0000 (18:27 +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: I031149cea0deffbc575799abd7a7d3adb4aafe8f
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)]
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: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: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)]
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: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: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: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: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)]
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: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: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: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:02:24 +0000 (18:02 +0000)]
Merge changes I1489eaf6,I8ee8f978 into nyc-dev am:
575add3bcf am:
7706e91d8f am:
a871b53ff3
am:
f72e83bb92
Change-Id: I9b08eedb8c1a03c72b5b54e76ed949a6e9dbc161
Adam Seaton [Wed, 21 Sep 2016 18:02:16 +0000 (18:02 +0000)]
Updating security string to 2016-11-05 on nyc-dev am:
002132648d am:
a6071948d8 am:
a947d89f1d
am:
40365595b2
Change-Id: I133ea994d7b178726fc97cea3868d00cb42dbbfa
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:59 +0000 (18:01 +0000)]
Updating Security String to 2016-11-01 on nyc-dev am:
2a00b24144 am:
7d01908b3b am:
8bd50bc352
am:
35eba634c3
Change-Id: I76455f373e010878cda4d29b5e443109ab86f23b
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)]
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: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: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:16 +0000 (17:57 +0000)]
Merge changes I1489eaf6,I8ee8f978 into nyc-dev am:
575add3bcf
am:
8a73d65a54
Change-Id: I19878511ff4709fe8e96c7815ef7923def5e9ea4
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:57:09 +0000 (17:57 +0000)]
Updating security string to 2016-11-05 on nyc-dev am:
002132648d
am:
8f911960cf
Change-Id: Id8d5c8a3351d87873336a5b14e6634d335af0e9f
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:58 +0000 (17:56 +0000)]
Updating Security String to 2016-11-01 on nyc-dev am:
2a00b24144
am:
f305906a95
Change-Id: I8a2a223d759402a2d198e34a2f215fa00ab86511
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:19 +0000 (17:55 +0000)]
Merge changes I1489eaf6,I8ee8f978 into nyc-dev
am:
575add3bcf
Change-Id: I10fd35297b5e662b9eb7804f3eea6fbea761ce12
Adam Seaton [Wed, 21 Sep 2016 17:55:18 +0000 (17:55 +0000)]
Updating security string to 2016-11-05 on nyc-dev
am:
002132648d
Change-Id: I00ffcb925f579ad2e404dafeaa2d85cf76e021f3
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:51:40 +0000 (17:51 +0000)]
Updating Security String to 2016-11-01 on nyc-dev
am:
2a00b24144
Change-Id: I19a783b2e608de9b3be07f442a9762336f2105c1
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
Yohann Roussel [Mon, 19 Sep 2016 15:49:03 +0000 (17:49 +0200)]
Fix bad JACK_PLUGIN variable
Changed to LOCAL_JACK_PLUGIN.
(cherry picked from commit
17924b136cb5bfc60d138e8c7e5c18a90b5965c3)
Test: Manually tested by some manual activations of the coverage plugin.
Change-Id: I1be4aaa502103fc308d35a5672dc4fe5900c4ebe
Yohann Roussel [Fri, 5 Aug 2016 15:45:10 +0000 (17:45 +0200)]
Add support for Jack plugin
And ensure compatibility with coverage plugin.
(cherry picked from commit
862bb84d37e3e6ca61080de58f206e512e09d4e0)
Bug:
28876950
Test: Manually tested by some manual activations of the coverage plugin.
Change-Id: I804558a501825357bf0812de626d2957eedbdc13
Colin Cross [Wed, 21 Sep 2016 02:28:59 +0000 (02:28 +0000)]
Merge "Replace usages of my_register_name with my_all_targets" am:
077d9d5fe7 am:
e373117cac
am:
1f351ad75c
Change-Id: Ie0b935e6209a941cfe992276270b5b5b3e5c4f95
Colin Cross [Wed, 21 Sep 2016 02:09:54 +0000 (02:09 +0000)]
Merge "Replace usages of my_register_name with my_all_targets" am:
077d9d5fe7
am:
e373117cac
Change-Id: I4636a410ec035c21fc20c04f47cada7b08c31b8e
Colin Cross [Wed, 21 Sep 2016 02:05:53 +0000 (02:05 +0000)]
Merge "Replace usages of my_register_name with my_all_targets"
am:
077d9d5fe7
Change-Id: I7e833dab3ff53e8524a227038c8de92e8e67393c
Treehugger Robot [Wed, 21 Sep 2016 00:38:59 +0000 (00:38 +0000)]
Merge "Replace usages of my_register_name with my_all_targets"
Adam Seaton [Tue, 20 Sep 2016 23:04:43 +0000 (23:04 +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
am:
49e53327b1
Change-Id: Iccf59a9de9493d79b5d46e1f586c7776c9105497
Colin Cross [Tue, 20 Sep 2016 23:01:28 +0000 (16:01 -0700)]
Replace usages of my_register_name with my_all_targets
A few module types add extra dependencies on $(my_register_name), move
them to $(my_all_targets) so that they are built for mm and mma too.
Bug:
31526036
Test: mmm framework
Change-Id: I2e594ce771451a99691739b963f4ce517e9dd595
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
Android Build Merger (Role) [Tue, 20 Sep 2016 22:59:12 +0000 (22:59 +0000)]
Merge "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:
c19f6a4a29" into nyc-mr1-dev-plus-aosp
Adam Seaton [Tue, 20 Sep 2016 22:59:04 +0000 (22:59 +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:
c19f6a4a29
Change-Id: Icc46360218ade5aba1288702ec50926ba05f14fc
Adam Seaton [Tue, 20 Sep 2016 22:58:59 +0000 (22:58 +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
am:
b53c8c78fc
Change-Id: I6a95c5ad8ddafdd40ce1b5dbb0f03977b231aca7
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-05 on mnc-dev b/
31618336 am:
dcfd738833 am:
fac5535f75 am:
405437474b am:
4afc7d56eb -s ours
am:
1ddbc7984a
Change-Id: I5abbd7303c060bc397640e8fb5f128184c25239a
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:58 +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:
92c806ed06
Change-Id: Ice5a6f91db67e70cb2ab3b3180bdb31d4947a8b6
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:13 +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: I7cf99f870f2095d1243ca54b7085accbb2d5ba76
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