OSDN Git Service
Adam Seaton [Tue, 17 Jan 2017 23:33:49 +0000 (23:33 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf am:
59cd888132 am:
f3d5948c42 am:
0a25d51000 -s ours am:
83731b0a4d am:
5467ba8cd1 am:
797e24cf9b
am:
85b71b92b5
Change-Id: Ia9969d04fdef2500bb8817516c49614902689739
Adam Seaton [Tue, 17 Jan 2017 23:33:42 +0000 (23:33 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3 am:
4a0196f3e3 am:
536287567a am:
98afadbfc7 -s ours am:
04418ff1d7 am:
a3e343bff5 am:
320061f5f1
am:
fd459b20de
Change-Id: I6e955b317ef9a0803bfc1fbd124e6e6ca64eefa4
Adam Seaton [Tue, 17 Jan 2017 23:31:19 +0000 (23:31 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf am:
59cd888132 am:
f3d5948c42 am:
0a25d51000 -s ours am:
83731b0a4d am:
5467ba8cd1
am:
797e24cf9b
Change-Id: I63e53f1edae0d8a7ed9311992a6cdbe9d5ffa903
Adam Seaton [Tue, 17 Jan 2017 23:31:13 +0000 (23:31 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3 am:
4a0196f3e3 am:
536287567a am:
98afadbfc7 -s ours am:
04418ff1d7 am:
a3e343bff5
am:
320061f5f1
Change-Id: I03a37713db8822a166c93bb86679272385fee8a9
Adam Seaton [Tue, 17 Jan 2017 23:29:19 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf am:
59cd888132 am:
f3d5948c42 am:
0a25d51000 -s ours am:
83731b0a4d
am:
5467ba8cd1
Change-Id: Idca82ca69bb37d9fa1e48bd9671332beaeb6bf37
Adam Seaton [Tue, 17 Jan 2017 23:29:13 +0000 (23:29 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3 am:
4a0196f3e3 am:
536287567a am:
98afadbfc7 -s ours am:
04418ff1d7
am:
a3e343bff5
Change-Id: I315beda1d66107e5cf6e7b4ae8ee3dcfc994b5c1
Adam Seaton [Tue, 17 Jan 2017 23:27:18 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e am:
f2da174999
am:
543c171c07
Change-Id: If9a46eae1e121d5c8d80c1a4a269968c0e1e7460
Adam Seaton [Tue, 17 Jan 2017 23:27:18 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf am:
59cd888132 am:
f3d5948c42 am:
0a25d51000 -s ours
am:
83731b0a4d
Change-Id: I99cb2970cefcc91a1412a7aec7fd8da2aa90e1d2
Adam Seaton [Tue, 17 Jan 2017 23:27:11 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3 am:
4a0196f3e3 am:
536287567a am:
98afadbfc7 -s ours
am:
04418ff1d7
Change-Id: I795a9b9788037159223de543e69cc9afcc14d94f
Adam Seaton [Tue, 17 Jan 2017 23:27:11 +0000 (23:27 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342 am:
9a6c74e74d
am:
f3804904a0
Change-Id: I5966b3e24466c5dc51d6e94830f0444af0e6529e
Adam Seaton [Tue, 17 Jan 2017 23:24:48 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a am:
7b5b22f71e
am:
f2da174999
Change-Id: Iab28f54f6be36e37fbdd842b72cfa2f60f33eae3
Adam Seaton [Tue, 17 Jan 2017 23:24:46 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf am:
59cd888132 am:
f3d5948c42
am:
0a25d51000 -s ours
Change-Id: I4da6286d07d2d9c79a7d97047fd3a67d171dc2b7
Adam Seaton [Tue, 17 Jan 2017 23:24:41 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9 am:
0bda876342
am:
9a6c74e74d
Change-Id: Iff9d7522f43e685a3738832b473ea9684cdac66a
Adam Seaton [Tue, 17 Jan 2017 23:24:40 +0000 (23:24 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3 am:
4a0196f3e3 am:
536287567a
am:
98afadbfc7 -s ours
Change-Id: Ib23117fcd49472ae70ed216b71c31a53a82dc5bc
Adam Seaton [Tue, 17 Jan 2017 23:23:16 +0000 (23:23 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours am:
96ec99b33a
am:
7b5b22f71e
Change-Id: I1aee8fd6cf36d4a187a3813868bdfb1c173f2ffd
Adam Seaton [Tue, 17 Jan 2017 23:23:16 +0000 (23:23 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf am:
59cd888132
am:
f3d5948c42
Change-Id: I8400317cf9ef4cf83256718f6d4fa562c03a8af7
Adam Seaton [Tue, 17 Jan 2017 23:23:11 +0000 (23:23 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3 am:
4a0196f3e3
am:
536287567a
Change-Id: I1ae27549bdc3b6e476eaa97ff732f913048a9b78
Adam Seaton [Tue, 17 Jan 2017 23:23:10 +0000 (23:23 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours am:
efe40b59c9
am:
0bda876342
Change-Id: I3038c9bb0e68d8a390d490a3ee0d2027eb6a7513
Adam Seaton [Tue, 17 Jan 2017 23:21:17 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de am:
bc83db626c -s ours
am:
96ec99b33a
Change-Id: I50ab73e3148be9895ef79f0612bf2aaab714e47f
Adam Seaton [Tue, 17 Jan 2017 23:21:16 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours am:
0a46d4edcf
am:
59cd888132
Change-Id: Iacf37b8a4f0871a4ebdd2ac6be36f6f733815a01
Adam Seaton [Tue, 17 Jan 2017 23:21:12 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b am:
a37d310d61 -s ours
am:
efe40b59c9
Change-Id: I278b27d9e699f267ffbd0eaee4861818dc384f92
Adam Seaton [Tue, 17 Jan 2017 23:21:11 +0000 (23:21 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours am:
151506a2a3
am:
4a0196f3e3
Change-Id: I93459d2087188d6c0340e5e180f0f9ee34696ff9
Adam Seaton [Tue, 17 Jan 2017 23:18:46 +0000 (23:18 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91 am:
8e89e568b9
am:
8e90b1da24
Change-Id: Ie167252d0225afec37402e48f13ba039f76b9534
Adam Seaton [Tue, 17 Jan 2017 23:18:45 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098 am:
cc7fef92de
am:
bc83db626c -s ours
Change-Id: I1c943055a98563f7d3c6ebb1b10975119e3fd809
Adam Seaton [Tue, 17 Jan 2017 23:18:45 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d am:
b40dc64ed2 -s ours
am:
0a46d4edcf
Change-Id: I3a6449f14afc20983641b7ed14b69e2a32921552
Adam Seaton [Tue, 17 Jan 2017 23:18:41 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b am:
80bc7863c8 -s ours
am:
151506a2a3
Change-Id: Id67ddb86c94a008f319e2179dc54172fb3463531
Adam Seaton [Tue, 17 Jan 2017 23:18:41 +0000 (23:18 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57 am:
54b11f5c49
am:
9bbbf746ec
Change-Id: I3e492558fd5271a1661ecac667971f790643b720
Adam Seaton [Tue, 17 Jan 2017 23:18:40 +0000 (23:18 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407 am:
039d96139b
am:
a37d310d61 -s ours
Change-Id: Ib0c574081b99826ec576f402f1c4e4589dda7c79
Adam Seaton [Tue, 17 Jan 2017 23:16:16 +0000 (23:16 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba am:
cb8fef9d91
am:
8e89e568b9
Change-Id: Ia97740daf709d8c8d4bf992bf1acb8cd80fca8f4
Adam Seaton [Tue, 17 Jan 2017 23:16:14 +0000 (23:16 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d am:
41f489b098
am:
cc7fef92de
Change-Id: I9966dc52a69f3ab9fe861b30dbffffe85bf18b0b
Adam Seaton [Tue, 17 Jan 2017 23:16:14 +0000 (23:16 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours am:
d438fc526d
am:
b40dc64ed2 -s ours
Change-Id: I4e4da24075fdd2f188499d88c9015a5df7f83890
Adam Seaton [Tue, 17 Jan 2017 23:16:11 +0000 (23:16 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03 am:
cacce5db57
am:
54b11f5c49
Change-Id: Iff9e2dfc5dc5f9ef260829ef3e86e834aae53b4a
Adam Seaton [Tue, 17 Jan 2017 23:16:10 +0000 (23:16 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours am:
b0d0a4ec9b
am:
80bc7863c8 -s ours
Change-Id: Idf7249464429186c6bda1885659131f84e93f958
Adam Seaton [Tue, 17 Jan 2017 23:16:10 +0000 (23:16 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0 am:
b3048c5407
am:
039d96139b
Change-Id: Ibd1b6d1b381613d9e5bd5881d7e74b11985bd045
Adam Seaton [Tue, 17 Jan 2017 23:14:43 +0000 (23:14 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev am:
b6ac653f2d
am:
41f489b098
Change-Id: I8f35258670b1d60aeb1c74c48039e27be984f50a
Adam Seaton [Tue, 17 Jan 2017 23:14:40 +0000 (23:14 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev am:
a0cf89a0a0
am:
b3048c5407
Change-Id: I03bf0adaf3149f1b21abb26cf0232b846211f5e2
Adam Seaton [Tue, 17 Jan 2017 23:12:15 +0000 (23:12 +0000)]
Updating Security String to 2017-03-05 on nyc-dev am:
25b39b12ba
am:
cb8fef9d91
Change-Id: I57a8e17828c908dcdb588bb4df8e12eeeef45d27
Adam Seaton [Tue, 17 Jan 2017 23:12:15 +0000 (23:12 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am:
84888652e0 -s ours
am:
d438fc526d
Change-Id: I4e3fd5f7566475e654fa0036dae1011019f75394
Adam Seaton [Tue, 17 Jan 2017 23:12:11 +0000 (23:12 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev am:
28dae4b62b -s ours
am:
b0d0a4ec9b
Change-Id: I24ec0890fcb59e72f8ed721d8078dd021e78a60c
Adam Seaton [Tue, 17 Jan 2017 23:12:10 +0000 (23:12 +0000)]
Updating Security String to 2017-03-01 on nyc-dev am:
003e5aad03
am:
cacce5db57
Change-Id: I090fcc6c3986a07e2a5c6cd49e82b42470ea8002
Adam Seaton [Tue, 17 Jan 2017 23:10:15 +0000 (23:10 +0000)]
Updating Security String to 2017-03-05 on nyc-dev
am:
25b39b12ba
Change-Id: I85a8100d821ed89b5c0ee4c347bb09b822c15d8d
Adam Seaton [Tue, 17 Jan 2017 23:10:15 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev
am:
b6ac653f2d
Change-Id: I7bd08773c1c80d37c64cff7da299abc89c77faa6
Adam Seaton [Tue, 17 Jan 2017 23:10:12 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev
am:
84888652e0 -s ours
Change-Id: Iffdd616a77cdfc1080f0b2719efd485a39232d5a
Adam Seaton [Tue, 17 Jan 2017 23:10:09 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev
am:
a0cf89a0a0
Change-Id: I4de729620270345b03d1fb58711672392fc9c6f8
Adam Seaton [Tue, 17 Jan 2017 23:10:09 +0000 (23:10 +0000)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev
am:
28dae4b62b -s ours
Change-Id: I18f5e8d6919f1cf0e8d75781ba7c7b4cf39a6dcc
Adam Seaton [Tue, 17 Jan 2017 23:10:09 +0000 (23:10 +0000)]
Updating Security String to 2017-03-01 on nyc-dev
am:
003e5aad03
Change-Id: I5a7cec00ddc99b9b8791e2e61d21d1936d3afc4c
Connor O'Brien [Tue, 17 Jan 2017 20:16:34 +0000 (20:16 +0000)]
Merge "Pass flash erase & logical block size to mke2fs" am:
cf4f7eac85
am:
80daf82c0b
Change-Id: I839d2bfc446ce327af12f12596ba8836be108ac7
Connor O'Brien [Tue, 17 Jan 2017 20:13:33 +0000 (20:13 +0000)]
Merge "Pass flash erase & logical block size to mke2fs"
am:
cf4f7eac85
Change-Id: I135f5117e4c0ac02ee22e0d2e6262894cb18b629
Connor O'Brien [Tue, 17 Jan 2017 20:07:10 +0000 (20:07 +0000)]
Merge "Pass flash erase & logical block size to mke2fs"
Adam Seaton [Tue, 17 Jan 2017 19:37:18 +0000 (11:37 -0800)]
Updating Security String to 2017-03-05 on nyc-dev
b/
34345751
Change-Id: Ieaaccd7b92c85bb3389fab5e03011892bf7fdcba
Adam Seaton [Tue, 17 Jan 2017 19:36:19 +0000 (11:36 -0800)]
Updating Security String to 2017-03-01 on nyc-dev
b/
34345751
Change-Id: I55d9ba3f16264f9e4f9ad72e861527a3f8ae566c
Adam Seaton [Tue, 17 Jan 2017 19:34:17 +0000 (11:34 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on mnc-dev
b/
34345751
Change-Id: Id3a3555a1bf333895d9980ca9477304bd9660b38
Adam Seaton [Tue, 17 Jan 2017 19:33:25 +0000 (11:33 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on mnc-dev
b/
34345751
Change-Id: I135c327aa611e92775966c4960f9da6e2aa95ed9
Adam Seaton [Tue, 17 Jan 2017 19:29:08 +0000 (11:29 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev
b/
34345751
Change-Id: Ie5bd1ced37f4ca9642c572ca0e3e0008bf1639e8
Adam Seaton [Tue, 17 Jan 2017 19:28:06 +0000 (11:28 -0800)]
[DO NOT MERGE] Updating Security String to 2017-03-01 on lmp-dev
b/
34345751
Change-Id: I001816a1f60aa4229b8fb96a96737bcebf416cef
Lingfeng Yang [Tue, 17 Jan 2017 00:45:28 +0000 (00:45 +0000)]
Allow /dev/goldfish_sync
am:
bdceef4325
Change-Id: Iaa5b0fe304e3b65a4e58949d9c8fc7b3ce5f83ec
Tao Bao [Sat, 14 Jan 2017 15:43:26 +0000 (15:43 +0000)]
Merge "releasetools: Replace print stmt with print()." am:
4a0b494eea
am:
0e2a0fd76c
Change-Id: I4efbff199c3a44ddc33a0e46cdd64a6c949c5262
Tao Bao [Sat, 14 Jan 2017 15:40:27 +0000 (15:40 +0000)]
Merge "releasetools: Replace print stmt with print()."
am:
4a0b494eea
Change-Id: I8823ee5f778c3017d85c1fa6d0f159ad85178314
Tao Bao [Sat, 14 Jan 2017 15:36:40 +0000 (15:36 +0000)]
Merge "releasetools: Replace print stmt with print()."
Tao Bao [Sat, 14 Jan 2017 08:16:43 +0000 (08:16 +0000)]
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag." am:
ecbb31e8c4
am:
82c2fb0e21
Change-Id: If3acd29bc8854d1c1e2b53216f5e984cdd46c0e9
Tao Bao [Sat, 14 Jan 2017 08:13:43 +0000 (08:13 +0000)]
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag."
am:
ecbb31e8c4
Change-Id: I648906871d064a309b21eca4c8718bb15381f086
Treehugger Robot [Sat, 14 Jan 2017 08:08:30 +0000 (08:08 +0000)]
Merge "releasetools: Delete the obsolete --aslr_mode/-a flag."
Tao Bao [Tue, 10 Jan 2017 18:47:58 +0000 (10:47 -0800)]
releasetools: Replace print stmt with print().
So that it's compatible with Python 3.
Test: pylint --pylint=pylintrc
Change-Id: If06c135a492c94bedd713c8cbdf03155a502d5cd
Tao Bao [Fri, 13 Jan 2017 19:56:54 +0000 (11:56 -0800)]
releasetools: Delete the obsolete --aslr_mode/-a flag.
It was added in commit
96be7205dce97977909e93b73f48779fcce3bc65
("Working ASLR implementation.") in 2010, and removed in commit
1807e700a568d57901b835370d1b1ae05c3dbb0f ("don't generate retouch
commands in OTA scripts") in 2012.
Remove the obsolete --aslr_mode flag.
Test: ota_from_target_files.py still works (by generating incremental
and full OTAs respectively).
Change-Id: I6d8e62730ac192f3574d484c4a4b9b43b4ee0a9e
Chen Xu [Fri, 13 Jan 2017 22:10:32 +0000 (22:10 +0000)]
Merge "Include CarrierDefaultApp to the img" am:
5e6ce5f504
am:
10253bbea9
Change-Id: If9e2c093b2a0802c639b1a0d88e913300e94a3c0
Chen Xu [Fri, 13 Jan 2017 22:08:32 +0000 (22:08 +0000)]
Merge "Include CarrierDefaultApp to the img"
am:
5e6ce5f504
Change-Id: Ibe79b9b961f6a04535e2f34e3da2ef1e3367a9d9
Chen Xu [Fri, 13 Jan 2017 21:59:23 +0000 (21:59 +0000)]
Merge "Include CarrierDefaultApp to the img"
Connor O'Brien [Fri, 6 Jan 2017 00:48:14 +0000 (16:48 -0800)]
Pass flash erase & logical block size to mke2fs
This information can be used to tune ext4 stripe and stride in the
userdata partition for better performance
Test: Build & flash userdata, confirm correct stripe & stride values
Bug:
33243520
Merged-In: Ia97cdd2d0239c3484b895fce49299f692ef911d8
Change-Id: Ia97cdd2d0239c3484b895fce49299f692ef911d8
Signed-off-by: Connor O'Brien <connoro@google.com>
fionaxu [Fri, 13 Jan 2017 02:34:17 +0000 (18:34 -0800)]
Include CarrierDefaultApp to the img
Bug:
30958215
Test: Manual test
Change-Id: I67e235028b73513954b7d5f4fe2623700d176e87
Joachim Sauer [Fri, 13 Jan 2017 10:33:56 +0000 (10:33 +0000)]
Merge "Add java.time packages to whitelist." am:
4dbe67cddc
am:
4f60acde39
Change-Id: I792adfb7df7dba66236c15956c899a5b36a61a2f
Joachim Sauer [Fri, 13 Jan 2017 10:25:46 +0000 (10:25 +0000)]
Merge "Add java.time packages to whitelist."
am:
4dbe67cddc
Change-Id: I93342090e16090e73dd2377f027deedd321849d8
Joachim Sauer [Fri, 13 Jan 2017 10:18:18 +0000 (10:18 +0000)]
Merge "Add java.time packages to whitelist."
Lingfeng Yang [Tue, 10 May 2016 21:51:57 +0000 (14:51 -0700)]
Allow /dev/goldfish_sync
Change-Id: I41883eafd2b261d000c41eaf3ba04af7e2b89349
(cherry picked from commit
5d6ae8a3d467dd23a2f09a96bc4fdbea2d0353a2)
Jack He [Thu, 12 Jan 2017 08:46:13 +0000 (08:46 +0000)]
Merge "Add mk file parsers to support build variables required by system/bt" am:
7b66d28b25
am:
dfa69daccc
Change-Id: Ie7e81cfe290214734db6c09c42f4aba8d2cd2be8
Jack He [Thu, 12 Jan 2017 08:40:13 +0000 (08:40 +0000)]
Merge "Add mk file parsers to support build variables required by system/bt"
am:
7b66d28b25
Change-Id: I188658d0741722e78ed2b636e04830c0870ca728
Treehugger Robot [Thu, 12 Jan 2017 08:31:26 +0000 (08:31 +0000)]
Merge "Add mk file parsers to support build variables required by system/bt"
Jack He [Sat, 17 Dec 2016 23:36:32 +0000 (15:36 -0800)]
Add mk file parsers to support build variables required by system/bt
* BtConfigIncludeDir: Path to device specific config headers
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR
* BTHcilpIncluded: Path to Hcilp headers
BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED
* BtHciUseMct: Whether MCT is used
BLUETOOTH_HCI_USE_MCT
Bug:
32958753
Test: Code compilation, no user visible effects
Change-Id: I94cad65c77464e5b467abee05951ddfd35b9f27d
Colin Cross [Wed, 11 Jan 2017 23:59:39 +0000 (23:59 +0000)]
Merge "Don't run find on directories that don't exist" am:
c1df498f0c
am:
a8839ac623
Change-Id: Ia8043ec41fd4589a300aa2780e775d003e0f2d0a
Colin Cross [Wed, 11 Jan 2017 23:54:27 +0000 (23:54 +0000)]
Merge "Don't run find on directories that don't exist"
am:
c1df498f0c
Change-Id: If0792cb62b7e666ca700dbb9b0dbf4b3d6d3cd02
Treehugger Robot [Wed, 11 Jan 2017 23:42:40 +0000 (23:42 +0000)]
Merge "Don't run find on directories that don't exist"
Colin Cross [Wed, 11 Jan 2017 21:59:41 +0000 (13:59 -0800)]
Don't run find on directories that don't exist
$(shell find vendor) causes a warning in AOSP where vendor doesn't
exist.
Test: m -j, no warning
Change-Id: I28916594e0720c53823a3d9ed99b8af1d356af23
Joachim Sauer [Thu, 13 Oct 2016 16:24:01 +0000 (17:24 +0100)]
Add java.time packages to whitelist.
Bug:
28832222
Test: builds
Change-Id: I5a77f519f51eca93c34e4697b92a92bf72f4eda9
Jean-Luc Brouillet [Wed, 11 Jan 2017 02:17:59 +0000 (02:17 +0000)]
Merge "Move rs/scriptc to rs/script_api/include." am:
a3ab4cc9c9
am:
d9bfeff242
Change-Id: I0249452861ffd748200c02434674832a2303b20b
Jean-Luc Brouillet [Wed, 11 Jan 2017 02:12:58 +0000 (02:12 +0000)]
Merge "Move rs/scriptc to rs/script_api/include."
am:
a3ab4cc9c9
Change-Id: Iddbffd165df0bb1587fb534084014ced46fb529b
Jean-Luc Brouillet [Wed, 11 Jan 2017 02:04:15 +0000 (02:04 +0000)]
Merge "Move rs/scriptc to rs/script_api/include."
Steven Moreland [Mon, 9 Jan 2017 21:02:06 +0000 (21:02 +0000)]
Merge "embedded.mk: add android.hidl.memory@1.0-impl" am:
2ec742a956
am:
ff2c0a1433
Change-Id: I28e67e22a3fd5322a17a4ad2ee32f2b0fd0a0f70
Steven Moreland [Mon, 9 Jan 2017 20:57:36 +0000 (20:57 +0000)]
Merge "embedded.mk: add android.hidl.memory@1.0-impl"
am:
2ec742a956
Change-Id: Ifa7263257caf2198b5980b30f0efbfd129771e30
Treehugger Robot [Mon, 9 Jan 2017 20:51:15 +0000 (20:51 +0000)]
Merge "embedded.mk: add android.hidl.memory@1.0-impl"
Dan Cashman [Mon, 9 Jan 2017 20:42:55 +0000 (20:42 +0000)]
Merge "Split seapp_contexts into plat and nonplat components." am:
082e8e07ac
am:
a44337de33
Change-Id: I98a149f6609739986b52e594075c72b0cebd2c00
Dan Cashman [Mon, 9 Jan 2017 20:42:47 +0000 (20:42 +0000)]
Split seapp_contexts into plat and nonplat components. am:
6f1ea7101f
am:
c6321e54b6
Change-Id: I8548f258416b730625d332e461b16df5b27c5c9a
Dan Cashman [Mon, 9 Jan 2017 20:38:07 +0000 (20:38 +0000)]
Merge "Split seapp_contexts into plat and nonplat components."
am:
082e8e07ac
Change-Id: Id18ea3cafe444dc8574fd9ac0970f66dc0dad1aa
Dan Cashman [Mon, 9 Jan 2017 20:37:46 +0000 (20:37 +0000)]
Split seapp_contexts into plat and nonplat components.
am:
6f1ea7101f
Change-Id: If495c16b0259134492ba6f912a4d54c90fedc468
Treehugger Robot [Mon, 9 Jan 2017 20:30:21 +0000 (20:30 +0000)]
Merge "Split seapp_contexts into plat and nonplat components."
Tao Bao [Mon, 9 Jan 2017 19:32:44 +0000 (19:32 +0000)]
Merge "Makefile: Pack e2fsdroid into otatools.zip." am:
bb6935051a
am:
ca95ee0465
Change-Id: I3258e0fd12a859fdf307b854fe0a1af6cc0250c0
Tao Bao [Mon, 9 Jan 2017 19:32:30 +0000 (19:32 +0000)]
Makefile: Pack e2fsdroid into otatools.zip. am:
bcc3109262
am:
8c07d3c840
Change-Id: I618f192b092feef99f430b65a4463c925e382d1b
Tao Bao [Mon, 9 Jan 2017 19:27:01 +0000 (19:27 +0000)]
Merge "Makefile: Pack e2fsdroid into otatools.zip."
am:
bb6935051a
Change-Id: Id514131231d4f5123322e4d9e0c0f797198cb275
Tao Bao [Mon, 9 Jan 2017 19:27:00 +0000 (19:27 +0000)]
Makefile: Pack e2fsdroid into otatools.zip.
am:
bcc3109262
Change-Id: I32ef5db01b70420994f48fe35a8eb4ba071eb4be
Tao Bao [Mon, 9 Jan 2017 19:17:20 +0000 (19:17 +0000)]
Merge "Makefile: Pack e2fsdroid into otatools.zip."
Jean-Luc Brouillet [Mon, 9 Jan 2017 01:40:21 +0000 (17:40 -0800)]
Move rs/scriptc to rs/script_api/include.
Test: Compiled ImageProcessing_jb
Change-Id: Icf05a603671499665d2f31a8989fa69585a6f834
Steven Moreland [Sun, 8 Jan 2017 18:00:20 +0000 (10:00 -0800)]
embedded.mk: add android.hidl.memory@1.0-impl
Bug:
34134179
Test: both 32 and 64 bit versions of this file are on the device after a
clean build.
Change-Id: I75ab12246c2c44e39b5e863dfec98dc72a36fbbe
OSDN Git Service
