OSDN Git Service
Dan Stoza [Fri, 9 Sep 2016 20:53:52 +0000 (13:53 -0700)]
Remove DispSync default value/docs
Moves DispSync phase offset default values and documentation to
frameworks/native/services/surfaceflinger/Android.mk.
Bug:
30801895
Change-Id: I44a4355b2d112561b94ccfc6e9c3365885c205ad
Dirk Dougherty [Mon, 22 Aug 2016 23:37:08 +0000 (23:37 +0000)]
Merge "Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds." into nyc-dev am:
61ed44b678
am:
e00a9ba3b5
Change-Id: Ia3121c4513cbafab10bee0faf3c97e6e626b7c78
Dirk Dougherty [Mon, 22 Aug 2016 23:37:08 +0000 (23:37 +0000)]
Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds. am:
baa86c7bfe
am:
6903dc6a4b
Change-Id: I85173ac8075b5d5b7674cb0741f5de3a48a22619
Dirk Dougherty [Mon, 22 Aug 2016 23:23:16 +0000 (23:23 +0000)]
Merge "Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds." into nyc-dev
am:
61ed44b678
Change-Id: I4f273dee1571c20eaa3b99a4493ab0885185aee0
Dirk Dougherty [Mon, 22 Aug 2016 23:23:15 +0000 (23:23 +0000)]
Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds.
am:
baa86c7bfe
Change-Id: I8529b06551f79b696c40d10a26f9ea94f10a0a47
Dirk Dougherty [Mon, 22 Aug 2016 23:04:28 +0000 (23:04 +0000)]
Merge "Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds." into nyc-dev
Alistair Strachan [Mon, 22 Aug 2016 21:10:01 +0000 (21:10 +0000)]
DO NOT MERGE ANYWHERE Avoid accidentally using the host's native 'as' command. am:
eea0ad4ca0 -s ours am:
15d96a6b74 -s ours am:
9aacce7aed -s ours
am:
decff97502 -s ours
Change-Id: I89f7db61a2720d54c07935512de57d589fdcb27a
Alistair Strachan [Mon, 22 Aug 2016 21:00:29 +0000 (21:00 +0000)]
DO NOT MERGE ANYWHERE Avoid accidentally using the host's native 'as' command. am:
eea0ad4ca0 -s ours am:
15d96a6b74 -s ours
am:
9aacce7aed -s ours
Change-Id: I75dd3ef8ca66716313d50d066d3a25b0222ffe8f
Alistair Strachan [Mon, 22 Aug 2016 20:56:27 +0000 (20:56 +0000)]
DO NOT MERGE ANYWHERE Avoid accidentally using the host's native 'as' command. am:
eea0ad4ca0 -s ours
am:
15d96a6b74 -s ours
Change-Id: Ia123b7a3fd44fe6f5abbe94dee77c7293b44291f
Alistair Strachan [Mon, 22 Aug 2016 20:51:28 +0000 (20:51 +0000)]
DO NOT MERGE ANYWHERE Avoid accidentally using the host's native 'as' command.
am:
eea0ad4ca0 -s ours
Change-Id: I65b9ff6de6a44559eacfb862680e020584fdd059
Alistair Strachan [Thu, 5 May 2016 23:29:08 +0000 (16:29 -0700)]
DO NOT MERGE ANYWHERE 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
5ff9c81b6c0f23dfbc08c95c1294b3b37110ecf0)
Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342
Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
Dirk Dougherty [Sun, 21 Aug 2016 18:40:19 +0000 (11:40 -0700)]
Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds.
Change-Id: Iceea38241b08fd9571d26862f0468f8b25da7f1c
Dirk Dougherty [Fri, 19 Aug 2016 13:15:23 +0000 (13:15 +0000)]
Merge "update dac legacy templates for N release." into nyc-dev am:
c5a1c1b3c4
am:
34813a5721
Change-Id: I44a8bf1ec103cc6a2cef4ffc0f5e510dd84a47da
Dirk Dougherty [Fri, 19 Aug 2016 13:15:22 +0000 (13:15 +0000)]
update dac legacy templates for N release. am:
8aec568883
am:
4bf80111a2
Change-Id: I3047aaade4b38505dd8c8f8e8b73a4e96256317e
Adam Seaton [Fri, 19 Aug 2016 13:14:23 +0000 (13:14 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev am:
5c021503c6 am:
728d476140 am:
683d0f3780 am:
497d30de82 am:
888c180b88
am:
cb05b4c2e6
Change-Id: Ie12e2f295f1111a194e23f0a23c7b80c8d6b499c
Adam Seaton [Fri, 19 Aug 2016 13:14:22 +0000 (13:14 +0000)]
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
am:
6e4a224227
Change-Id: I9b9357aaf1d2c3e7dff526b826f149d56ed48c0e
Adam Seaton [Fri, 19 Aug 2016 13:14:21 +0000 (13:14 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350 am:
aa38670685 -s ours am:
002effed6c am:
9d38404635 am:
7a213e4b5f am:
60a2d17f93 am:
7a26d8beff
am:
c13992b04e
Change-Id: I9f4802906605ac8688ab9744e3df7fb3433c1f40
Adam Seaton [Fri, 19 Aug 2016 13:14:20 +0000 (13:14 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46 am:
8cf402ace2 -s ours am:
498e9543af am:
66a58cd393 am:
e83a09a202 am:
c28f13dfa5 am:
811c1790a4
am:
714e164f32
Change-Id: Iaac398301bee2d411472c37cecce598817b3628c
Adam Seaton [Fri, 19 Aug 2016 13:14:20 +0000 (13:14 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October Security am:
cb60b2dedb am:
e977aadfea am:
95e55dce44 am:
7d5d729831 am:
5d6ad4a9ab
am:
4249783848
Change-Id: I2f38e133c7aa47ba4c567b633baf8a3ee940852a
Dirk Dougherty [Fri, 19 Aug 2016 05:31:18 +0000 (05:31 +0000)]
Merge "update dac legacy templates for N release." into nyc-dev
am:
c5a1c1b3c4
Change-Id: Icd3232500aaf51bd6144d4307a7bb0b8055e09c3
Dirk Dougherty [Fri, 19 Aug 2016 05:31:18 +0000 (05:31 +0000)]
update dac legacy templates for N release.
am:
8aec568883
Change-Id: Ic392b6ff4b35cc9ede8f2b61a50ae12190443486
Dirk Dougherty [Fri, 19 Aug 2016 05:27:58 +0000 (05:27 +0000)]
Merge "update dac legacy templates for N release." into nyc-dev
Dirk Dougherty [Fri, 19 Aug 2016 02:34:32 +0000 (19:34 -0700)]
update dac legacy templates for N release.
Change-Id: I746e5cd15ff7485a69df6006a9302408e9e38c5b
Adam Seaton [Thu, 18 Aug 2016 23:05:26 +0000 (23:05 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev am:
5c021503c6 am:
728d476140 am:
683d0f3780 am:
497d30de82
am:
888c180b88
Change-Id: Iec2e9341e2a085bdbeb623221ad9858ece85fc62
Adam Seaton [Thu, 18 Aug 2016 23:05:25 +0000 (23:05 +0000)]
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
Adam Seaton [Thu, 18 Aug 2016 23:05:25 +0000 (23:05 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350 am:
aa38670685 -s ours am:
002effed6c am:
9d38404635 am:
7a213e4b5f am:
60a2d17f93
am:
7a26d8beff
Change-Id: Ic518359cfd895ece48802a92bcae703d91bc1888
Adam Seaton [Thu, 18 Aug 2016 23:05:24 +0000 (23:05 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46 am:
8cf402ace2 -s ours am:
498e9543af am:
66a58cd393 am:
e83a09a202 am:
c28f13dfa5
am:
811c1790a4
Change-Id: Ia387f39b62842bb75512d41795a83a276bbf5e4b
Adam Seaton [Thu, 18 Aug 2016 23:05:24 +0000 (23:05 +0000)]
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
Adam Seaton [Thu, 18 Aug 2016 22:17:59 +0000 (22:17 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev am:
5c021503c6 am:
728d476140 am:
683d0f3780 am:
497d30de82
am:
888c180b88
Change-Id: I3bf2d8ce8c8e19eb5c9764614960532bbf97863d
Adam Seaton [Thu, 18 Aug 2016 22:17:58 +0000 (22:17 +0000)]
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
Adam Seaton [Thu, 18 Aug 2016 22:14:18 +0000 (22:14 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev am:
5c021503c6 am:
728d476140 am:
683d0f3780
am:
497d30de82
Change-Id: I4a252fd56a7be17fb17271f97fe67bb8119fac1b
Adam Seaton [Thu, 18 Aug 2016 22:14:18 +0000 (22:14 +0000)]
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
Adam Seaton [Thu, 18 Aug 2016 22:10:49 +0000 (22:10 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev am:
5c021503c6 am:
728d476140
am:
683d0f3780
Change-Id: Ib212304a4bf2401c8e6c58fed54d59f300b485ef
Adam Seaton [Thu, 18 Aug 2016 22:10:48 +0000 (22:10 +0000)]
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
Adam Seaton [Thu, 18 Aug 2016 22:07:49 +0000 (22:07 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev am:
5c021503c6
am:
728d476140
Change-Id: I8896e9674a44bf238569683e1b3e905721a0fb84
Adam Seaton [Thu, 18 Aug 2016 22:07:48 +0000 (22:07 +0000)]
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am:
bb45bd20e9
am:
eacfc7749b
Change-Id: If1da1eb56de73999837f681443e0722b3edd5ee4
Adam Seaton [Thu, 18 Aug 2016 22:04:24 +0000 (22:04 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev
am:
5c021503c6
Change-Id: I8f6b62b6ed8e5170b6558d7d21155f3e31665b6a
Adam Seaton [Thu, 18 Aug 2016 22:04:24 +0000 (22:04 +0000)]
Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)
am:
bb45bd20e9
Change-Id: I72826f39c7c5db303106694fd41927e09f1c86d7
Adam Seaton [Thu, 18 Aug 2016 21:58:58 +0000 (21:58 +0000)]
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev
Adam Seaton [Thu, 18 Aug 2016 21:57:49 +0000 (21:57 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350 am:
aa38670685 -s ours am:
002effed6c am:
9d38404635 am:
7a213e4b5f am:
60a2d17f93
am:
7a26d8beff
Change-Id: I2a27949d766154118ca7e6f8287b69575d2205b2
Adam Seaton [Thu, 18 Aug 2016 21:54:19 +0000 (21:54 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350 am:
aa38670685 -s ours am:
002effed6c am:
9d38404635 am:
7a213e4b5f
am:
60a2d17f93
Change-Id: I8798fade7fe351becb25533a23aeb4410fb9fd42
Adam Seaton [Thu, 18 Aug 2016 21:51:48 +0000 (21:51 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46 am:
8cf402ace2 -s ours am:
498e9543af am:
66a58cd393 am:
e83a09a202 am:
c28f13dfa5
am:
811c1790a4
Change-Id: Ibca68adf55f6f0e61841fd858dbb18e6b67feee3
Adam Seaton [Thu, 18 Aug 2016 21:48:18 +0000 (21:48 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46 am:
8cf402ace2 -s ours am:
498e9543af am:
66a58cd393 am:
e83a09a202
am:
c28f13dfa5
Change-Id: I9695ce7eb5600ecffd5557932c192a1b6d234148
Adam Seaton [Thu, 18 Aug 2016 21:48:16 +0000 (21:48 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350 am:
aa38670685 -s ours am:
002effed6c am:
9d38404635
am:
7a213e4b5f
Change-Id: I7ca99e1f67b9f578f4599564671b362c5d1d2d6a
Adam Seaton [Thu, 18 Aug 2016 21:45:16 +0000 (21:45 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350 am:
aa38670685 -s ours am:
002effed6c
am:
9d38404635
Change-Id: I14b559fe957d29cf1903e08aa709968d58b1ee59
Adam Seaton [Thu, 18 Aug 2016 21:41:46 +0000 (21:41 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46 am:
8cf402ace2 -s ours am:
498e9543af am:
66a58cd393
am:
e83a09a202
Change-Id: Ie554e7488c21f227af2de0a3b227d5f0f6b93025
Adam Seaton [Thu, 18 Aug 2016 21:41:45 +0000 (21:41 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350 am:
aa38670685 -s ours
am:
002effed6c
Change-Id: Ibc35d4abfc195e81f8488b3f9b6e3f5d939d6af2
Adam Seaton [Thu, 18 Aug 2016 21:38:46 +0000 (21:38 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46 am:
8cf402ace2 -s ours am:
498e9543af
am:
66a58cd393
Change-Id: I0f492bc570ca7e489a106b40ba41c2601b6a1a12
Adam Seaton [Thu, 18 Aug 2016 21:38:45 +0000 (21:38 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c am:
d2c5aaf350
am:
aa38670685 -s ours
Change-Id: I9eaf2e0e1674b113a51098b8442f634e7da64f7f
Adam Seaton [Thu, 18 Aug 2016 21:35:45 +0000 (21:35 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46 am:
8cf402ace2 -s ours
am:
498e9543af
Change-Id: I48d4d237da43a37535c8061e7c6fabeb9009aebe
Adam Seaton [Thu, 18 Aug 2016 21:32:13 +0000 (21:32 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3 am:
01262bec46
am:
8cf402ace2 -s ours
Change-Id: I7814fa4d5394fd747fc5674a8a044a127c92d049
Adam Seaton [Thu, 18 Aug 2016 21:19:13 +0000 (21:19 +0000)]
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
Adam Seaton [Thu, 18 Aug 2016 21:12:43 +0000 (21:12 +0000)]
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
Adam Seaton [Thu, 18 Aug 2016 21:11:04 +0000 (14:11 -0700)]
Update Security String to 2016-10-05 to Platform and CTS for October
Security Updates (rebased)
b/
30946906
Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d
Adam Seaton [Thu, 18 Aug 2016 21:09:12 +0000 (21:09 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October Security am:
cb60b2dedb am:
e977aadfea
am:
95e55dce44
Change-Id: I379e5cc3ed69561d7bb22d866af2803cb28b0060
Adam Seaton [Thu, 18 Aug 2016 21:05:12 +0000 (21:05 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October Security am:
cb60b2dedb
am:
e977aadfea
Change-Id: I74de2d5d5b8317805eddb5ce2fd0430c504c4dd1
Adam Seaton [Thu, 18 Aug 2016 21:02:37 +0000 (21:02 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264 am:
35419f227c
am:
d2c5aaf350
Change-Id: I03f0476f3bf42fe67ec77d657cc046841fae19e6
Adam Seaton [Thu, 18 Aug 2016 21:01:43 +0000 (21:01 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October Security
am:
cb60b2dedb
Change-Id: Ibab3f4e47e05a2ec708105ddc3824df83ea95458
Adam Seaton [Thu, 18 Aug 2016 20:58:41 +0000 (20:58 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47 am:
ef7c757264
am:
35419f227c
Change-Id: I0dfedcac1afc572d41f04c80720b5ea0b9f991f4
Adam Seaton [Thu, 18 Aug 2016 20:52:11 +0000 (20:52 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c am:
6bf8893f47
am:
ef7c757264
Change-Id: I213a8678acce680ff12341023ea7e653dddb9b71
Adam Seaton [Thu, 18 Aug 2016 20:49:10 +0000 (20:49 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a am:
4e53c17e7c
am:
6bf8893f47
Change-Id: I3f0fe988dd4f25942972335a2f4c0987ff519e97
Adam Seaton [Thu, 18 Aug 2016 20:45:40 +0000 (20:45 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security am:
5da5be6a6a
am:
4e53c17e7c
Change-Id: I66f35a8c156f893d3eda8d4f0ad00af4e5831eef
Adam Seaton [Thu, 18 Aug 2016 20:42:39 +0000 (20:42 +0000)]
Update Security String to 2016-10-05 to platform and CTS for October Security
am:
5da5be6a6a
Change-Id: Ic2356af128f6acb376403bac689b28ab94335ff4
Adam Seaton [Thu, 18 Aug 2016 18:33:49 +0000 (18:33 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6 am:
143bd253d3
am:
01262bec46
Change-Id: I5902c6e7898bf961d0c1d61fe68d411291d9a14c
Adam Seaton [Thu, 18 Aug 2016 18:31:26 +0000 (11:31 -0700)]
Update Security String to 2016-10-05 to platform and CTS for October
Security
b/
30946906
Change-Id: I7be961202245aa93a5e72e19cb39064b7675bf95
Adam Seaton [Thu, 18 Aug 2016 18:30:01 +0000 (18:30 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588 am:
4739db2df6
am:
143bd253d3
Change-Id: Id1c63d9fcc98c2f708601ea1e7b8b6ed3aeb9c40
Adam Seaton [Thu, 18 Aug 2016 18:27:00 +0000 (18:27 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709 am:
3920471588
am:
4739db2df6
Change-Id: I0debb51e5b85691189e481cb80eb756e7bf158a8
Adam Seaton [Thu, 18 Aug 2016 18:24:00 +0000 (18:24 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024 am:
985a8b2709
am:
3920471588
Change-Id: Ic6ba2917a9345601502050c76f0b2208eba24b66
Adam Seaton [Thu, 18 Aug 2016 18:20:59 +0000 (18:20 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October am:
3e6d6b3024
am:
985a8b2709
Change-Id: I18be5d0228c07d3f1b836f1f92d63538bef96f88
Adam Seaton [Thu, 18 Aug 2016 18:18:00 +0000 (18:18 +0000)]
Update Security String to 2016-10-01 to platform and CTS for October
am:
3e6d6b3024
Change-Id: Ia61e8d85659152cdbdd2786c6651753e00e762f1
Adam Seaton [Thu, 18 Aug 2016 17:33:30 +0000 (10:33 -0700)]
Update Security String to 2016-10-01 to platform and CTS for October Security
Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684
Adam Seaton [Thu, 18 Aug 2016 17:19:10 +0000 (10:19 -0700)]
Update Security String to 2016-10-01 to platform and CTS for October
Change-Id: If6d3cd562ceff218136185cd16b52ab92ed8d0f2
Andriy Naborskyy [Tue, 16 Aug 2016 14:06:45 +0000 (14:06 +0000)]
Merge "board-specific prep recovery imagefix recovery size issue" into nyc-mr1-dev
Amanda Kassay [Tue, 16 Aug 2016 13:47:09 +0000 (13:47 +0000)]
Adding project path metadata to head_tag.cs
am:
594392adec
Change-Id: Ie7d4912990f8d904cdd4d6633336ad16c2c36dbd
Amanda Kassay [Wed, 20 Jul 2016 17:33:42 +0000 (13:33 -0400)]
Adding project path metadata to head_tag.cs
Change-Id: I031e5c1f1c2dd4763c43f0bfde03eb2fa8831472
Ian Pedowitz [Mon, 15 Aug 2016 17:24:24 +0000 (17:24 +0000)]
Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev
Adam Seaton [Fri, 12 Aug 2016 21:28:49 +0000 (21:28 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours am:
cdbdfcdbd5 am:
afe698d76e am:
0a3ae2d78d am:
b542d46745
am:
30cae665ea
Change-Id: I68291e30fb198c029999bf25cebbd9cfe630d352
Adam Seaton [Fri, 12 Aug 2016 21:25:17 +0000 (21:25 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours am:
cdbdfcdbd5 am:
afe698d76e am:
0a3ae2d78d
am:
b542d46745
Change-Id: I030d17ffefee2096df8eaf5b9dce72b86a0bca01
Adam Seaton [Fri, 12 Aug 2016 21:21:45 +0000 (21:21 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours am:
cdbdfcdbd5 am:
afe698d76e
am:
0a3ae2d78d
Change-Id: I6d317744f1269b1760d4c12a734e3377033acbd7
Adam Seaton [Fri, 12 Aug 2016 21:18:17 +0000 (21:18 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours am:
cdbdfcdbd5
am:
afe698d76e
Change-Id: I8b5cc4ff2992ffe0f229a811076b215b7d0ab0af
Adam Seaton [Fri, 12 Aug 2016 21:14:53 +0000 (21:14 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31 am:
d5c59f3b97 -s ours
am:
cdbdfcdbd5
Change-Id: Ic0300b3b3018dc08277ddc0398143ae8bcbd0fbc
Adam Seaton [Fri, 12 Aug 2016 21:10:44 +0000 (21:10 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3 am:
a14e8c2f31
am:
d5c59f3b97 -s ours
Change-Id: Ibcf2cb117de238fa76e0551fd97a12d88200e30d
Tianjie Xu [Fri, 12 Aug 2016 01:04:27 +0000 (18:04 -0700)]
Replace META/care_map.txt when signing target files
Do not copy the "META/care_map.txt" from the source zipfile when
signing the target files with sign_target_files_apks. Because we'll
generate a new care_map after rebuilding the system/vendor images;
and we'll write the new "META/care_map.txt" to the signed-target-file.
Change-Id: I6919cfdf8314a4084b5f612a9c89469f391486a4
Test: Run sign_target_files_apks locally, and the entry is updated.
Bug:
30812253
(cherry picked from commit
4f09900e676f7343643ada3797c3597f9c363015)
Alex Deymo [Fri, 12 Aug 2016 17:59:55 +0000 (17:59 +0000)]
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.
Adam Seaton [Thu, 11 Aug 2016 21:55:18 +0000 (21:55 +0000)]
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
Adam Seaton [Thu, 11 Aug 2016 21:51:46 +0000 (21:51 +0000)]
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
Adam Seaton [Thu, 11 Aug 2016 21:48:46 +0000 (21:48 +0000)]
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
Adam Seaton [Thu, 11 Aug 2016 21:45:16 +0000 (21:45 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am:
fa721839b2
am:
fdf4c8d8a6
Change-Id: I5ad798a99ea890bff77c9cd579a72e3794df92e0
Adam Seaton [Thu, 11 Aug 2016 21:41:45 +0000 (21:41 +0000)]
Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
am:
fa721839b2
Change-Id: Iff74354f3540185eff4ae1b44600f5d00e1029cd
Tao Bao [Thu, 11 Aug 2016 18:00:58 +0000 (11:00 -0700)]
releasetools: Update the path to /default.prop for A/B devices.
On A/B devices (i.e. system_root_image="true"), /default.prop is
packaged at ROOT/default.prop (as opposed to BOOT/RAMDISK/default.prop
for non-A/B devices). Update the path so that we handle properties like
ro.bootimage.build.fingerprint properly.
The one for recovery is not affected, which stays at
BOOT/RAMDISK/default.prop for A/B devices and gets updated correctly.
Bug:
30811237
Test: Verify the property in the generated signed-TF.zip.
Change-Id: Id201a042d7ea988a64f89c6d04f43326a9851e27
(cherry picked from commit
28e2fa1726f3434417e2f0d5f1a810cbd657a5e3)
Adam Seaton [Thu, 11 Aug 2016 19:39:25 +0000 (12:39 -0700)]
Update Security String to 2016-09-06 to platform and CTS for September
Security (+Quadrooter,-PZ)
Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a
Alex Deymo [Thu, 4 Aug 2016 23:06:12 +0000 (16:06 -0700)]
Replace OTA sideload verification key when signing A/B devices.
The update-payload-key is used by update_engine_sideload from recovery
to verify an update payload.
Bug:
27178350
(cherry picked from commit
b3e8ce6d1d936cddb6eb4a5052de8ed7ba85d68e)
Change-Id: Iac239732251e550e9966bf284b68bc9d578f22ff
Alex Deymo [Thu, 4 Aug 2016 03:52:54 +0000 (20:52 -0700)]
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
c6ebe9fcd7ca0c991f5ae0e711a251959d0d41f4)
Change-Id: I0128d7f684d32201e227acce798b25f12982eaaa
Ian Pedowitz [Mon, 8 Aug 2016 19:45:03 +0000 (12:45 -0700)]
N-DR/N-MR1 is 7.1
Bug:
30734691
Change-Id: I20a4e705ad972bbf24fb0aab65ab410c11496199
TreeHugger Robot [Tue, 9 Aug 2016 20:51:33 +0000 (20:51 +0000)]
Merge "build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT" into nyc-mr1-dev
Nick Desaulniers [Mon, 8 Aug 2016 17:51:10 +0000 (10:51 -0700)]
build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT
Bug:
30681215
Change-Id: Ic3a18a65f9b1251c2592fc54569b2c6af99e6ece
Adam Seaton [Tue, 9 Aug 2016 00:11:11 +0000 (00:11 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am:
a53b868e6e am:
e158db8ad2 am:
68870731a5 am:
f7de14b8a1
am:
2d033a9e51
Change-Id: Iacc3e198cff56bdd396a64e594d19e4ca635c3e4
Adam Seaton [Tue, 9 Aug 2016 00:05:36 +0000 (00:05 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am:
a53b868e6e am:
e158db8ad2 am:
68870731a5
am:
f7de14b8a1
Change-Id: I1412b8cee615535abe366b43ce4041efb4488bde
Adam Seaton [Mon, 8 Aug 2016 23:57:10 +0000 (23:57 +0000)]
Update security string to 2016-09-07 to platform and CTS for September respin am:
cc5148493f am:
637fa9c4c5 am:
5ed4043667 am:
48e00645fe am:
f63dfac0e3
am:
a14e8c2f31
Change-Id: I471611e0996ab801d105a392fafbb8c1008c3350
Adam Seaton [Mon, 8 Aug 2016 23:57:05 +0000 (23:57 +0000)]
Update Security String to 2016-09-07 to platform and CTS for September respin am:
a53b868e6e am:
e158db8ad2
am:
68870731a5
Change-Id: I3e302e74d090485c179381a085d39d17bc212d67
OSDN Git Service
