OSDN Git Service
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: I5535731dcf6adcb4a3a5ecb5c0423bf5025012d1
Dirk Dougherty [Fri, 19 Aug 2016 05:31:18 +0000 (05:31 +0000)]
update dac legacy templates for N release.
am:
8aec568883
Change-Id: I34cd948facfc7e2ba8e8056475628f670061193e
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 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: I7a13a3034c551e41ec6698cf0a6b5531cf97abbf
Adam Seaton [Thu, 18 Aug 2016 22:17:59 +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: I6e4e41743108647a00e5a4d93bd3aea9a5ead6ca
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:59:02 +0000 (21:59 +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: I3e3c64e5fad6491cdf2f50cfa1bc351829d32af5
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: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:46 +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: If2a8d98cad3f333e59bc5b3b946ec1fc4adb6d54
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: I4d9d39bf9763b16eeb51caffc215939982e1bd6d
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
Chih-Hung Hsieh [Wed, 17 Aug 2016 18:00:08 +0000 (18:00 +0000)]
Merge "Clarify default tidy check lists." am:
ce4c49c2f2
am:
94a2c5f6b7
Change-Id: I7b0bc11c284b07c1c9826a6cadcd098dcd5668e9
Dan Willemsen [Wed, 17 Aug 2016 18:00:07 +0000 (18:00 +0000)]
Merge "Support dist-ing the userdatatarball" am:
9abbeb3d8f
am:
faac87dd9a
Change-Id: If7c93a8c57db6bf6c5a329f3419086d5affe7089
Chih-Hung Hsieh [Wed, 17 Aug 2016 18:00:07 +0000 (18:00 +0000)]
Merge "Remove spaces in tidy check list." am:
e7bca12466
am:
34c8c0ac33
Change-Id: Ibcd65e9fac13f49780ccfb25891d0b26b1e0c4cf
Chih-Hung Hsieh [Wed, 17 Aug 2016 17:48:56 +0000 (17:48 +0000)]
Merge "Clarify default tidy check lists."
am:
ce4c49c2f2
Change-Id: If0641d286d6f1fefa871a18c21282f4fcd10d8a1
Dan Willemsen [Wed, 17 Aug 2016 17:48:54 +0000 (17:48 +0000)]
Merge "Support dist-ing the userdatatarball"
am:
9abbeb3d8f
Change-Id: I0dac58c2eed164247fe595da6897ff00f0786e18
Chih-Hung Hsieh [Wed, 17 Aug 2016 17:48:52 +0000 (17:48 +0000)]
Merge "Remove spaces in tidy check list."
am:
e7bca12466
Change-Id: I852d42992bc1ddb0a17dd1dcf03cf25f1d114552
Treehugger Robot [Wed, 17 Aug 2016 04:56:07 +0000 (04:56 +0000)]
Merge "Clarify default tidy check lists."
Dan Willemsen [Wed, 17 Aug 2016 00:58:18 +0000 (00:58 +0000)]
Merge "Support dist-ing the userdatatarball"
Treehugger Robot [Wed, 17 Aug 2016 00:44:50 +0000 (00:44 +0000)]
Merge "Remove spaces in tidy check list."
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
Change-Id: I1438597bd29df80665571f7dc3b4957b9adde870
Chih-Hung Hsieh [Tue, 16 Aug 2016 23:27:30 +0000 (16:27 -0700)]
Remove spaces in tidy check list.
This will allow spaces in LOCAL_TIDY_CHECKS.
Bug: http://b/
27779618
Change-Id: I6f9b133220e49b2581a06d2fd9083a1d6b7badca
Test: build with WITH_TIDY=1.
Chih-Hung Hsieh [Tue, 16 Aug 2016 20:42:06 +0000 (13:42 -0700)]
Clarify default tidy check lists.
* Sort all enabled and disabled checks.
* Disable google-default-arguments for external and vendor projects.
Bug: http://b/
27779618
Change-Id: I59e6eaf84fddf54bd89eb71a2189d73b64968057
Test: build with WITH_TIDY=1.
Amanda Kassay [Tue, 16 Aug 2016 13:47:43 +0000 (13:47 +0000)]
Adding project path metadata to head_tag.cs
am:
594392adec
Change-Id: I8b6475e58af84cade97992c1fecb1444d0a13c15
Amanda Kassay [Wed, 20 Jul 2016 17:33:42 +0000 (13:33 -0400)]
Adding project path metadata to head_tag.cs
Change-Id: I031e5c1f1c2dd4763c43f0bfde03eb2fa8831472
Dan Willemsen [Mon, 15 Aug 2016 21:21:32 +0000 (21:21 +0000)]
Merge "Fix GET-INSTALL-PATH to work with Soong" am:
6b9aa6938d
am:
9fc9cac0ac
Change-Id: I36aa2dcfca3b0a57c83291d1df07afb50bf3dc92
Dan Willemsen [Mon, 15 Aug 2016 21:17:33 +0000 (21:17 +0000)]
Merge "Fix GET-INSTALL-PATH to work with Soong"
am:
6b9aa6938d
Change-Id: I9f433cb383846ec6ccb8e39be4b30110d60d54fd
Dan Willemsen [Mon, 15 Aug 2016 21:07:53 +0000 (21:07 +0000)]
Merge "Fix GET-INSTALL-PATH to work with Soong"
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: I55cfc39698d8fc30c0e3e00b67e721b3a4e2bd70
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 18:10:07 +0000 (18:10 +0000)]
Merge "Replace META/care_map.txt when signing target files" am:
7b11cacbba
am:
bf5e3d168d
Change-Id: I6476c710a220e2fe91dd06203ee418665ebd1a37
Tianjie Xu [Fri, 12 Aug 2016 18:06:41 +0000 (18:06 +0000)]
Merge "Replace META/care_map.txt when signing target files"
am:
7b11cacbba
Change-Id: Ia8e888a0f330d00f6518e352356ca480819586db
Tianjie Xu [Fri, 12 Aug 2016 18:01:55 +0000 (18:01 +0000)]
Merge "Replace META/care_map.txt when signing target files"
Dan Willemsen [Fri, 12 Aug 2016 00:20:33 +0000 (17:20 -0700)]
Fix GET-INSTALL-PATH to work with Soong
This was printing all of the Soong modules in addition to the modules
defined in the ONE_SHOT_MAKEFILE. So replicate what we did with
MODULES-IN-* with GET-INSTALL-PATH-IN-* and update all the users.
Bug:
30191725
Change-Id: Ib1e4bf00f64d7a3e8cd91f44eaf1ff82fdfbf162
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
Colin Cross [Fri, 12 Aug 2016 00:06:25 +0000 (00:06 +0000)]
Merge "Fix discrepancy in SANITIZE_TARGET format with soong." am:
0d86fc57cd
am:
0216097482
Change-Id: Ia45aaf2ac6e36b3d960d97a65ecccd7ca6da83d3
Colin Cross [Fri, 12 Aug 2016 00:04:38 +0000 (00:04 +0000)]
Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
am:
0d86fc57cd
Change-Id: Ib643a2d9682eabd494f40a0d5b7fbaeb42583d30
Colin Cross [Thu, 11 Aug 2016 23:53:29 +0000 (23:53 +0000)]
Merge "Fix discrepancy in SANITIZE_TARGET format with soong."
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: Ia8cb06a26fc6856a85bbd3d6266eb41034bd600a
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 20:45:46 +0000 (20:45 +0000)]
Merge "releasetools: Update the path to /default.prop for A/B devices." am:
6d64ff1bf7
am:
6eb5564025
Change-Id: Icd75b3de56e129cc932445b9ec5a00e0ec8525b6
Tao Bao [Thu, 11 Aug 2016 20:42:34 +0000 (20:42 +0000)]
Merge "releasetools: Update the path to /default.prop for A/B devices."
am:
6d64ff1bf7
Change-Id: I1deeff5d22454c1fae5b450dbf2e6a35ffbc6227
Tao Bao [Thu, 11 Aug 2016 20:39:31 +0000 (20:39 +0000)]
Merge "releasetools: Update the path to /default.prop for A/B devices."
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
Dan Willemsen [Thu, 11 Aug 2016 19:36:44 +0000 (19:36 +0000)]
Merge "Use soong_zip and zip2zip to make dist faster" am:
6dcdb45485
am:
96963dfd4d
Change-Id: I0f19fc1908f84da6f602564d57256423b108bf16
Dan Willemsen [Thu, 11 Aug 2016 19:33:10 +0000 (19:33 +0000)]
Merge "Use soong_zip and zip2zip to make dist faster"
am:
6dcdb45485
Change-Id: I9a4241b436f7dead5de7b02d3af56004b1eed42f
Treehugger Robot [Thu, 11 Aug 2016 19:28:13 +0000 (19:28 +0000)]
Merge "Use soong_zip and zip2zip to make dist faster"
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
Dan Albert [Thu, 11 Aug 2016 16:56:10 +0000 (16:56 +0000)]
Merge "Add support for NDK r13." am:
287093a98c
am:
ae49ab2f0f
Change-Id: Ie8530ae07fb60b2dd15d2d88cecf9fad1458a337
Dan Albert [Thu, 11 Aug 2016 16:52:52 +0000 (16:52 +0000)]
Merge "Add support for NDK r13."
am:
287093a98c
Change-Id: I8e10422cdd20d3ee0402acabbdbe60a41ba59901
Dan Albert [Thu, 11 Aug 2016 16:46:34 +0000 (16:46 +0000)]
Merge "Add support for NDK r13."
Dan Willemsen [Sun, 7 Aug 2016 03:15:06 +0000 (20:15 -0700)]
Use soong_zip and zip2zip to make dist faster
soong_zip parallelizes the compression when creating a zip file, which
makes these packaging steps far shorter.
zip2zip skips the decompression and recompression during the -img- file
creation.
For an aosp_arm64-eng aosp/master build:
target_files.zip: 92s to 60s
symbols.zip: 147s to 7s
img.zip: 64s to 0.5s
There's still room to parallelize the image compression during
target_files.zip (add_img_to_target_files step takes most of the time)
Change-Id: I7b6a91e4a7dbeda2e49ca936b10181cff2f973d7
Dan Albert [Tue, 9 Aug 2016 00:14:59 +0000 (17:14 -0700)]
Add support for NDK r13.
Test: make checkbuild
Change-Id: I4521c768c67771cee9df9e59ed45344c40c48a38
Alex Deymo [Wed, 10 Aug 2016 05:04:23 +0000 (05:04 +0000)]
Merge changes from topic 'ab_sideload' am:
3750ed3e17
am:
93ff77ad1a
Change-Id: Idbe285c05dfb9b4b6252ef87a3066f8a41f13044
Alex Deymo [Wed, 10 Aug 2016 05:00:57 +0000 (05:00 +0000)]
Merge changes from topic 'ab_sideload'
am:
3750ed3e17
Change-Id: I4afbecc40068c7a87c7532b22a404319c24e2c05
Alex Deymo [Wed, 10 Aug 2016 03:55:24 +0000 (03:55 +0000)]
Merge changes from topic 'ab_sideload'
* changes:
Replace OTA sideload verification key when signing A/B devices.
Install the update-payload-key in the recovery image as well.