OSDN Git Service
Adam Seaton [Wed, 14 Dec 2016 00:46:50 +0000 (00:46 +0000)]
Update Security String to 2017-02-05 on nyc-dev am:
af63566009 am:
f6dbc77231 am:
dec80c416e am:
89e9059995
am:
94fbbd200e
Change-Id: Iba933d6e2b04726c60baf8ec0f041fcfeb704325
Adam Seaton [Wed, 14 Dec 2016 00:46:44 +0000 (00:46 +0000)]
Update Security String to 2017-02-01 on nyc-dev am:
35901a7fd0 am:
eaf4508b09 am:
2cc397f4c5 am:
548f3ec0d3
am:
0dd5eff86c
Change-Id: I719c47f83ab36f0a91702d18481d938d7de9693f
Adam Seaton [Wed, 14 Dec 2016 00:40:49 +0000 (00:40 +0000)]
Update Security String to 2017-02-05 on nyc-dev am:
af63566009 am:
f6dbc77231 am:
dec80c416e
am:
89e9059995
Change-Id: Iee0a4138b5293e3c2ad6b6017548b029a99c88fd
Adam Seaton [Wed, 14 Dec 2016 00:40:43 +0000 (00:40 +0000)]
Update Security String to 2017-02-01 on nyc-dev am:
35901a7fd0 am:
eaf4508b09 am:
2cc397f4c5
am:
548f3ec0d3
Change-Id: Idf5473287d764e87705930d0ad439f8b727780cf
Adam Seaton [Wed, 14 Dec 2016 00:34:18 +0000 (00:34 +0000)]
Update Security String to 2017-02-05 on nyc-dev am:
af63566009 am:
f6dbc77231
am:
dec80c416e
Change-Id: I0d45af12dda068eb9bf0bdcdceedb7f66429bca8
Adam Seaton [Wed, 14 Dec 2016 00:34:13 +0000 (00:34 +0000)]
Update Security String to 2017-02-01 on nyc-dev am:
35901a7fd0 am:
eaf4508b09
am:
2cc397f4c5
Change-Id: Idbfdb2ec56c06f1b79371eaadc1f188e41cc2db6
Adam Seaton [Wed, 14 Dec 2016 00:27:48 +0000 (00:27 +0000)]
Update Security String to 2017-02-05 on nyc-dev am:
af63566009
am:
f6dbc77231
Change-Id: I299409eb4369fe127a93ab8392ec847cd4df7f1f
Adam Seaton [Wed, 14 Dec 2016 00:27:43 +0000 (00:27 +0000)]
Update Security String to 2017-02-01 on nyc-dev am:
35901a7fd0
am:
eaf4508b09
Change-Id: Iba9c094d3f0b5cc1a234ee43cc96947226f9d219
Adam Seaton [Wed, 14 Dec 2016 00:21:16 +0000 (00:21 +0000)]
Update Security String to 2017-02-05 on nyc-dev
am:
af63566009
Change-Id: If672e58e906d16e1c863c54fc8b16903ce8df25a
Adam Seaton [Wed, 14 Dec 2016 00:21:12 +0000 (00:21 +0000)]
Update Security String to 2017-02-01 on nyc-dev
am:
35901a7fd0
Change-Id: I4cb3261d651f82ab13a5aad310562bfcc8f0e4d9
Dan Willemsen [Tue, 13 Dec 2016 22:42:10 +0000 (22:42 +0000)]
Merge "Sort and reorganize clear_vars.mk to make merges easier" am:
e26036ad5e am:
0ab11a22ba -s ours
am:
54fcb1a61f -s ours
Change-Id: I797e4c49148018b9d828632a11dc35dfa9c95b11
Dan Willemsen [Tue, 13 Dec 2016 22:34:39 +0000 (22:34 +0000)]
Merge "Sort and reorganize clear_vars.mk to make merges easier" am:
e26036ad5e
am:
0ab11a22ba -s ours
Change-Id: I63808e7bd913d228a586e5ffce1373f3b5ec541e
Dan Willemsen [Tue, 13 Dec 2016 22:28:08 +0000 (22:28 +0000)]
Merge "Sort and reorganize clear_vars.mk to make merges easier"
am:
e26036ad5e
Change-Id: I60b8b084e4db3d041cd9fdebd789e7b2b797312c
Dan Willemsen [Tue, 13 Dec 2016 22:22:58 +0000 (22:22 +0000)]
Merge "Sort and reorganize clear_vars.mk to make merges easier"
Dan Willemsen [Tue, 13 Dec 2016 21:20:33 +0000 (21:20 +0000)]
Merge "Sort and reorganize clear_vars.mk to make merges easier" into nyc-mr1-dev-plus-aosp
am:
bb84f65d5b
Change-Id: I7c52fdcc5563d79bfcd11f6c55e08556e74c176a
Dan Willemsen [Tue, 13 Dec 2016 21:20:31 +0000 (21:20 +0000)]
Sort and reorganize clear_vars.mk to make merges easier
am:
05ebf54158
Change-Id: Id6d997a93ce730dda61bd0b44734a7576ce7fef2
Dan Willemsen [Tue, 13 Dec 2016 00:52:57 +0000 (16:52 -0800)]
Sort and reorganize clear_vars.mk to make merges easier
Moved common variables from other sections back to the common section,
then sort each section.
Test: build-aosp_angler.ninja is identical before/after
Change-Id: Ibb75935205aa80aaa392c358f8d0599ba624f90d
Merged-In: Ibb75935205aa80aaa392c358f8d0599ba624f90d
Dan Willemsen [Tue, 13 Dec 2016 21:13:12 +0000 (21:13 +0000)]
Merge "Sort and reorganize clear_vars.mk to make merges easier" into nyc-mr1-dev-plus-aosp
Paul Duffin [Tue, 13 Dec 2016 09:57:54 +0000 (09:57 +0000)]
Merge "Use legacy-test instead of core-junit" am:
e28eb9ff0e am:
34e4a7b7fd
am:
2c373fbeb4
Change-Id: Iee96cc2506b96fb9857c4d8cfe6a6224e0465baa
Paul Duffin [Tue, 13 Dec 2016 09:50:53 +0000 (09:50 +0000)]
Merge "Use legacy-test instead of core-junit" am:
e28eb9ff0e
am:
34e4a7b7fd
Change-Id: Iffa85f70db201559074e78b5e470cd34c9ccf709
Paul Duffin [Tue, 13 Dec 2016 09:44:25 +0000 (09:44 +0000)]
Merge "Use legacy-test instead of core-junit"
am:
e28eb9ff0e
Change-Id: I9f08137ad0795bfd48f1fb36fa4ed6313af7cc3c
Paul Duffin [Tue, 13 Dec 2016 09:34:17 +0000 (09:34 +0000)]
Merge "Use legacy-test instead of core-junit"
Elliott Hughes [Tue, 13 Dec 2016 04:47:22 +0000 (04:47 +0000)]
Merge "Revert "Merge changes from topic 'fsconfig-2'"" am:
95cee3b0e6 am:
57cc36a33b
am:
26a352bc9e
Change-Id: Ifdf06077fb442242f383377b01ecdc8fd5fdb737
Elliott Hughes [Tue, 13 Dec 2016 04:47:06 +0000 (04:47 +0000)]
Revert "Merge changes from topic 'fsconfig-2'" am:
fad4b4b715 am:
e472384a4b
am:
2ed4b63f7b
Change-Id: I960313aafc55543af16af3d7b8c2bee80a0ad552
Elliott Hughes [Tue, 13 Dec 2016 04:40:20 +0000 (04:40 +0000)]
Merge "Revert "Merge changes from topic 'fsconfig-2'"" am:
95cee3b0e6
am:
57cc36a33b
Change-Id: I10d0c9eb5e58f47332e7040a96f7001e93ee4b55
Elliott Hughes [Tue, 13 Dec 2016 04:40:06 +0000 (04:40 +0000)]
Revert "Merge changes from topic 'fsconfig-2'" am:
fad4b4b715
am:
e472384a4b
Change-Id: I27663d76ae76ecc42e7bace0674012decadf9325
Elliott Hughes [Tue, 13 Dec 2016 04:34:09 +0000 (04:34 +0000)]
Merge "Revert "Merge changes from topic 'fsconfig-2'""
am:
95cee3b0e6
Change-Id: I280306551f365febf206c451e4d7df04f697f50c
Elliott Hughes [Tue, 13 Dec 2016 04:34:07 +0000 (04:34 +0000)]
Revert "Merge changes from topic 'fsconfig-2'"
am:
fad4b4b715
Change-Id: I34f415419dc050f5e6d4fe1fc30b896d7e3edb1b
Elliott Hughes [Tue, 13 Dec 2016 04:23:48 +0000 (04:23 +0000)]
Merge "Revert "Merge changes from topic 'fsconfig-2'""
Dan Willemsen [Tue, 13 Dec 2016 00:52:57 +0000 (16:52 -0800)]
Sort and reorganize clear_vars.mk to make merges easier
Moved common variables from other sections back to the common section,
then sort each section.
Test: build-aosp_angler.ninja is identical before/after
Change-Id: Ibb75935205aa80aaa392c358f8d0599ba624f90d
Merged-In: Ibb75935205aa80aaa392c358f8d0599ba624f90d
(cherry picked from commit
3ea1a059175384793f2f2cf751fe550c568673d9)
Elliott Hughes [Tue, 13 Dec 2016 01:28:44 +0000 (17:28 -0800)]
Revert "Merge changes from topic 'fsconfig-2'"
This reverts commit
1b2de51881e0ff76e2ad9d3d0405fc7185b0f86f, reversing
changes made to
77ea32f378651a3585e245eb964dab979d191310.
Android Build Merger (Role) [Mon, 12 Dec 2016 19:06:32 +0000 (19:06 +0000)]
Android Build Merger (Role) [Mon, 12 Dec 2016 19:06:29 +0000 (19:06 +0000)]
Adam Seaton [Mon, 12 Dec 2016 19:06:15 +0000 (19:06 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5 am:
9021a3cca1 am:
b4bce92c76 am:
6a991fcc71 am:
31fffa19e3 am:
dd58f8a897 am:
f99b74b718 am:
4b2829e580
am:
1be8b94bb6
Change-Id: Ib064448d0a23eb2491ca75389b358af7a6d6b460
Adam Seaton [Mon, 12 Dec 2016 19:06:12 +0000 (19:06 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5 am:
9021a3cca1 am:
b4bce92c76 am:
6a991fcc71 am:
31fffa19e3 am:
dd58f8a897 am:
f99b74b718 am:
4b2829e580
am:
fea1d52df2
Change-Id: I20aa82390e6a28ce31d72a8b2c32ab884360c422
Adam Seaton [Mon, 12 Dec 2016 19:06:07 +0000 (19:06 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f am:
647c853775 am:
71a1639a8b am:
ad296afa4c am:
4fde436775 am:
79a86d157a am:
6e4e6c168e am:
0a62746b5e
am:
c5eba42bb6
Change-Id: Ie436dfc30aca32294186ec65581f6a6168431f56
Adam Seaton [Mon, 12 Dec 2016 19:06:04 +0000 (19:06 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f am:
647c853775 am:
71a1639a8b am:
ad296afa4c am:
4fde436775 am:
79a86d157a am:
6e4e6c168e am:
0a62746b5e
am:
7e05ac5723
Change-Id: I1301ec94957fdf3f09f5dbb4da6a626f982cabf9
Android Build Merger (Role) [Mon, 12 Dec 2016 19:05:59 +0000 (19:05 +0000)]
Merge changes from topic 'am-
5763da0e905f4d4bbc3592d77062fe2f' into nyc-mr2-dev-plus-aosp
* changes:
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9 am:
2eeaa80336 am:
533221ff49 am:
76d6a87a5d am:
3270d73dc0 am:
09f08e2ded am:
53cd7ebd83 am:
19a038d04d
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07 am:
af617a8560 am:
72aef1bed8 am:
f840599ac2 am:
555baa4d6d am:
cc200a8993
Adam Seaton [Mon, 12 Dec 2016 19:05:41 +0000 (19:05 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9 am:
2eeaa80336 am:
533221ff49 am:
76d6a87a5d am:
3270d73dc0 am:
09f08e2ded am:
53cd7ebd83
am:
6668275ddf
Change-Id: I2d9c6835857c4cb172cbe63857820dbbbf69fb6d
Adam Seaton [Mon, 12 Dec 2016 19:05:40 +0000 (19:05 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9 am:
2eeaa80336 am:
533221ff49 am:
76d6a87a5d am:
3270d73dc0 am:
09f08e2ded am:
53cd7ebd83
am:
19a038d04d
Change-Id: Ie37e8de0f07dff9cba7e8ec4c344ae3f1b7b130d
Adam Seaton [Mon, 12 Dec 2016 19:05:32 +0000 (19:05 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07 am:
af617a8560 am:
72aef1bed8 am:
f840599ac2 am:
555baa4d6d
am:
cc200a8993
Change-Id: I2982b679bb7275699f36dcb96ea0fafce0ff336a
Adam Seaton [Mon, 12 Dec 2016 19:05:31 +0000 (19:05 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07 am:
af617a8560 am:
72aef1bed8 am:
f840599ac2 am:
555baa4d6d
am:
24378595e4
Change-Id: Ia7a694b5322e40f81560d9141e81b0859e909099
Adam Seaton [Mon, 12 Dec 2016 18:59:46 +0000 (18:59 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5 am:
9021a3cca1 am:
b4bce92c76 am:
6a991fcc71 am:
31fffa19e3 am:
dd58f8a897 am:
f99b74b718
am:
4b2829e580
Change-Id: I7b866e16f7ceb4a97b9ba2e71c8578dbd98fcb2b
Adam Seaton [Mon, 12 Dec 2016 18:59:44 +0000 (18:59 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5 am:
9021a3cca1 am:
b4bce92c76 am:
6a991fcc71 am:
31fffa19e3 am:
dd58f8a897 am:
f99b74b718
am:
4b2829e580
Change-Id: I87bf48e791082aa22dff083bc78269749b33fe6b
Adam Seaton [Mon, 12 Dec 2016 18:59:38 +0000 (18:59 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f am:
647c853775 am:
71a1639a8b am:
ad296afa4c am:
4fde436775 am:
79a86d157a am:
6e4e6c168e
am:
0a62746b5e
Change-Id: I39957e467154514eb39682263cf22d1d09cb2a98
Adam Seaton [Mon, 12 Dec 2016 18:59:36 +0000 (18:59 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f am:
647c853775 am:
71a1639a8b am:
ad296afa4c am:
4fde436775 am:
79a86d157a am:
6e4e6c168e
am:
0a62746b5e
Change-Id: I71f7c1d28be53828eedb0d7d0e87ed7e74cbc9c7
Adam Seaton [Mon, 12 Dec 2016 18:59:10 +0000 (18:59 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9 am:
2eeaa80336 am:
533221ff49 am:
76d6a87a5d am:
3270d73dc0 am:
09f08e2ded
am:
53cd7ebd83
Change-Id: I21553f3ae87d9f0a4d91ed512a2bff4fe77c4e69
Adam Seaton [Mon, 12 Dec 2016 18:59:09 +0000 (18:59 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9 am:
2eeaa80336 am:
533221ff49 am:
76d6a87a5d am:
3270d73dc0 am:
09f08e2ded
am:
53cd7ebd83
Change-Id: Id509ca2265795852c911510e154fae1a0ea2a58d
Adam Seaton [Mon, 12 Dec 2016 18:59:01 +0000 (18:59 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07 am:
af617a8560 am:
72aef1bed8 am:
f840599ac2
am:
555baa4d6d
Change-Id: Idd98a0529d075057b8c07839958adaecfa552bd6
Adam Seaton [Mon, 12 Dec 2016 18:59:01 +0000 (18:59 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07 am:
af617a8560 am:
72aef1bed8 am:
f840599ac2
am:
555baa4d6d
Change-Id: Icf8d3df4f6a32a3e3f87c8fd8221df54402dd3c5
Adam Seaton [Mon, 12 Dec 2016 18:53:10 +0000 (18:53 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5 am:
9021a3cca1 am:
b4bce92c76 am:
6a991fcc71 am:
31fffa19e3 am:
dd58f8a897
am:
f99b74b718
Change-Id: Ifdd6b7b97116e87eb347654f6b4fd58dce762f88
Adam Seaton [Mon, 12 Dec 2016 18:53:03 +0000 (18:53 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f am:
647c853775 am:
71a1639a8b am:
ad296afa4c am:
4fde436775 am:
79a86d157a
am:
6e4e6c168e
Change-Id: Iabafc29bdec6f7af5770c35fdc4440ef4791a6a7
Adam Seaton [Mon, 12 Dec 2016 18:52:38 +0000 (18:52 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9 am:
2eeaa80336 am:
533221ff49 am:
76d6a87a5d am:
3270d73dc0
am:
09f08e2ded
Change-Id: Ib33c380ed6ecf0bf2ca32b10c0fcbbc484fa30c2
Adam Seaton [Mon, 12 Dec 2016 18:52:31 +0000 (18:52 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07 am:
af617a8560 am:
72aef1bed8
am:
f840599ac2
Change-Id: Ia6447f27ff12cb014dc20d02b7c69b8cbc9e66a6
Adam Seaton [Mon, 12 Dec 2016 18:46:44 +0000 (18:46 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5 am:
9021a3cca1 am:
b4bce92c76 am:
6a991fcc71 am:
31fffa19e3
am:
dd58f8a897
Change-Id: I8295a13cce99632b6baba8f7dd39b85c476a9fd4
Adam Seaton [Mon, 12 Dec 2016 18:46:34 +0000 (18:46 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f am:
647c853775 am:
71a1639a8b am:
ad296afa4c am:
4fde436775
am:
79a86d157a
Change-Id: I74d42b7063ac3fd4e7f050624565cd51c9251d31
Adam Seaton [Mon, 12 Dec 2016 18:46:10 +0000 (18:46 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9 am:
2eeaa80336 am:
533221ff49 am:
76d6a87a5d
am:
3270d73dc0
Change-Id: Ib7ea56a7be914552e60343754433edd62d39e1f3
Adam Seaton [Mon, 12 Dec 2016 18:46:00 +0000 (18:46 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07 am:
af617a8560
am:
72aef1bed8
Change-Id: Ic57232ec5c653efb660fd83ee10443910dd6309d
Adam Seaton [Mon, 12 Dec 2016 18:40:09 +0000 (18:40 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5 am:
9021a3cca1 am:
b4bce92c76 am:
6a991fcc71
am:
31fffa19e3
Change-Id: I7e54075284198836e8c91d97d673021a3b35b3d3
Adam Seaton [Mon, 12 Dec 2016 18:40:02 +0000 (18:40 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f am:
647c853775 am:
71a1639a8b am:
ad296afa4c
am:
4fde436775
Change-Id: I76d202d15d6404ba16c7d2b51c495d4816638a45
Adam Seaton [Mon, 12 Dec 2016 18:39:37 +0000 (18:39 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9 am:
2eeaa80336 am:
533221ff49
am:
76d6a87a5d
Change-Id: I1cd72feb8dfe9631e28b2ea28a28977349a91183
Adam Seaton [Mon, 12 Dec 2016 18:39:30 +0000 (18:39 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0 am:
78cdf4fd07
am:
af617a8560
Change-Id: I779ed1ad9c63a0c0a5dd06354eaa0090d8b5c98d
Adam Seaton [Mon, 12 Dec 2016 18:33:43 +0000 (18:33 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5 am:
9021a3cca1 am:
b4bce92c76
am:
6a991fcc71
Change-Id: Ic0f0e2d509b1e41c74383a0ee289bd54535eb3f6
Adam Seaton [Mon, 12 Dec 2016 18:33:36 +0000 (18:33 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f am:
647c853775 am:
71a1639a8b
am:
ad296afa4c
Change-Id: I5c271f9b7bf7cf7780d86a9ee7e1852881962932
Adam Seaton [Mon, 12 Dec 2016 18:33:07 +0000 (18:33 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9 am:
2eeaa80336
am:
533221ff49
Change-Id: I565905749210ad8da105c3d3c5151bfa73c30f25
Adam Seaton [Mon, 12 Dec 2016 18:33:00 +0000 (18:33 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37 am:
8e5abe38c0
am:
78cdf4fd07
Change-Id: I842e2b6e945ccf499c64739113766591fd4d64ea
Adam Seaton [Mon, 12 Dec 2016 18:28:01 +0000 (18:28 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5 am:
9021a3cca1
am:
b4bce92c76
Change-Id: I7459650a50c0e149d95a32a115689ed88b7063f0
Adam Seaton [Mon, 12 Dec 2016 18:27:56 +0000 (18:27 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f am:
647c853775
am:
71a1639a8b
Change-Id: Iaf252d03e5cf7bfa7496c262f75db123590eaf35
Adam Seaton [Mon, 12 Dec 2016 18:27:33 +0000 (18:27 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9 am:
de5e2a48e9
am:
2eeaa80336
Change-Id: I89a04e1cffb9509132603a7b04d3789e07418ceb
Adam Seaton [Mon, 12 Dec 2016 18:27:28 +0000 (18:27 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f am:
c8d8647e37
am:
8e5abe38c0
Change-Id: Ia8b27f37c87f72adc4d8aa88aca67adf18d8701d
Adam Seaton [Mon, 12 Dec 2016 18:22:02 +0000 (18:22 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693 am:
f82e3fcdd5
am:
9021a3cca1
Change-Id: I79102e593b8b22be9db6d5a8c506800ba32d50e5
Adam Seaton [Mon, 12 Dec 2016 18:21:57 +0000 (18:21 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294 am:
34eec6554f
am:
647c853775
Change-Id: I69c99baaad95aacdc154f1db7d5960e6242cb28c
Adam Seaton [Mon, 12 Dec 2016 18:21:33 +0000 (18:21 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours am:
6671100ef9
am:
de5e2a48e9
Change-Id: Id72c5156465033f9baf8fca02eca34d2299879ef
Adam Seaton [Mon, 12 Dec 2016 18:21:28 +0000 (18:21 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours am:
2e720eba5f
am:
c8d8647e37
Change-Id: If00880a4b61eccd7b19a5027cef8a0cfd07f9c29
Adam Seaton [Mon, 12 Dec 2016 18:15:08 +0000 (18:15 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0 am:
cff982d693
am:
f82e3fcdd5
Change-Id: Ia9b86f93e3846c2246704376514e027b3aaa5116
Adam Seaton [Mon, 12 Dec 2016 18:15:02 +0000 (18:15 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec am:
9baf1b5294
am:
34eec6554f
Change-Id: I0a1dd54efa403f01c9a5c6aab7b104ae8e4fc575
Adam Seaton [Mon, 12 Dec 2016 18:14:33 +0000 (18:14 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e am:
6a8a7ef480 -s ours
am:
6671100ef9
Change-Id: I2648b6387ebbb60153aa1f8b9ed1eb480bf426ba
Adam Seaton [Mon, 12 Dec 2016 18:14:28 +0000 (18:14 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804 am:
ca32812b01 -s ours
am:
2e720eba5f
Change-Id: I41268e0dccc8aa6cb593cd6285e760f87aa54f94
Adam Seaton [Mon, 12 Dec 2016 18:09:34 +0000 (18:09 +0000)]
Updating Security String to 2017-02-05 in klp-dev am:
7078534eb1 am:
96ff32285e am:
5e8584b7e2 am:
6c8027f02c am:
f9a9de85c0
am:
cff982d693
Change-Id: I879170c4c55157b608a0f9f48eedc30e5ca2156e
Adam Seaton [Mon, 12 Dec 2016 18:09:28 +0000 (18:09 +0000)]
Update Security String to 2017-02-01 in klp-dev am:
b1a7ec0841 am:
5c99964c63 am:
ce2b665128 -s ours am:
2c827418dd am:
380ba6deec
am:
9baf1b5294
Change-Id: I9421f94e2bd13a0e3a2a056072f217cd6bd0fb3c
Adam Seaton [Mon, 12 Dec 2016 18:09:02 +0000 (18:09 +0000)]
Update Security String to 2017-02-05 in lmp-dev am:
fd48c0bf99 am:
63131f2e9e
am:
6a8a7ef480 -s ours
Change-Id: I9ca9c74be54bd567b5a1a14c74dad92b254b720e
Adam Seaton [Mon, 12 Dec 2016 18:08:57 +0000 (18:08 +0000)]
Update Security String to 2017-02-01 in lmp-dev am:
19717dff7c am:
36d8423804
am:
ca32812b01 -s ours
Change-Id: I1442ac08228cb1aa308869590dc0a0c16f9ab192
Dan Willemsen [Sat, 10 Dec 2016 07:33:51 +0000 (07:33 +0000)]
Merge "Fix PDK dupbuild issues" am:
d1b10b20f6 am:
22c01a60e4
am:
13a820d732
Change-Id: I244c95bf6c6131c22025b098da273854a295d6b8
Dan Willemsen [Sat, 10 Dec 2016 07:27:50 +0000 (07:27 +0000)]
Merge "Fix PDK dupbuild issues" am:
d1b10b20f6
am:
22c01a60e4
Change-Id: I2f1d5e204fb68d22de862f5806ace01c44c8da5d
Dan Willemsen [Sat, 10 Dec 2016 07:21:49 +0000 (07:21 +0000)]
Merge "Fix PDK dupbuild issues"
am:
d1b10b20f6
Change-Id: I8185087dd90009c5203549ac1cea111fc921d7d7
Treehugger Robot [Sat, 10 Dec 2016 07:14:11 +0000 (07:14 +0000)]
Merge "Fix PDK dupbuild issues"
Dan Willemsen [Sat, 10 Dec 2016 05:15:41 +0000 (21:15 -0800)]
Fix PDK dupbuild issues
The PDK uses pattern rules in order to install files from the PDK. When
those files already have build rules, the explicit rules override the
pattern rules, and everything works. But because Make (and Kati) doesn't
attempt to clean the file paths, if one of the rules has a redundant /,
we'll export two ninja rules, and ninja will error out with a dupbuild
error.
The PDK pattern rules are clean, but the explicit notice file creation
was not, it was always adding a double // in between NOTICE_FILES/src
and the module path.
Some modules were also setting a LOCAL_MODULE_PATH with a trailing /,
which is redundant, and also hits the above problem. Instead of fixing
all of the modules, just strip a trailing / from my_module_path.
Bug:
33451638
Test: Build with a PDK
Change-Id: Iff3e98fd191ea90626b9b89f179537e8a75f5ef2
Elliott Hughes [Sat, 10 Dec 2016 00:38:56 +0000 (00:38 +0000)]
Merge changes from topic 'fsconfig-2' am:
1b2de51881 am:
82b189dcee
am:
1b827f8fd3
Change-Id: I4833e774f2a9a6e6bbf46702ac9422b1fc0f0616
William Roberts [Sat, 10 Dec 2016 00:36:49 +0000 (00:36 +0000)]
fs_config: add unit tests am:
92ec0ab5e8 am:
bd19c0cd23
am:
d04e585b89
Change-Id: I3a51aabe9836224b07667eb60e0f506d41e22c3e
William Roberts [Sat, 10 Dec 2016 00:36:43 +0000 (00:36 +0000)]
fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement am:
7fe8b6d817 am:
ee9af6edfb
am:
0101f107c1
Change-Id: I2413e148c77b9c693e20705dff68c6976543b197
William Roberts [Sat, 10 Dec 2016 00:36:37 +0000 (00:36 +0000)]
fs_config: add group to build am:
2127b35526 am:
bdbafb5c38
am:
596993abb5
Change-Id: Iec1b9a253869eadb77bc49172088c392a3e868df
William Roberts [Sat, 10 Dec 2016 00:36:32 +0000 (00:36 +0000)]
fs_config: introduce group generator am:
1c4721c3c5 am:
3315954861
am:
6b50e15947
Change-Id: I325901641468ac931baae0c4e0b2a3d2ac163bd4
William Roberts [Sat, 10 Dec 2016 00:36:26 +0000 (00:36 +0000)]
fs_config: add passwd to build am:
6d5e0c5df2 am:
788899790d
am:
bdcec1e327
Change-Id: I6b0014e6a8158f04c719f96d5201c50a6058740e
William Roberts [Sat, 10 Dec 2016 00:36:21 +0000 (00:36 +0000)]
fs_config: introduce passwd generator am:
316f9462af am:
62d75469b1
am:
13be8e4305
Change-Id: I9a8681f10746bad905225f52d6774ace3799973c
William Roberts [Sat, 10 Dec 2016 00:36:14 +0000 (00:36 +0000)]
fs_config: generate friendly in AID class am:
8f42ce71ac am:
092fa031cd
am:
aa200330c5
Change-Id: I25a0a9b2b0d115bdf127501a316999a49c9ffab9
William Roberts [Sat, 10 Dec 2016 00:36:08 +0000 (00:36 +0000)]
fs_config: limit characters for AID_<name> sections am:
5f059a7691 am:
7fcf246c3b
am:
10db3e3cb9
Change-Id: I1e3435f190488ac485363ac5736541ba3ead96e0
William Roberts [Sat, 10 Dec 2016 00:36:02 +0000 (00:36 +0000)]
fs_config: generate oem AID header file am:
cfc51f5347 am:
9652abfeb4
am:
64ab591155
Change-Id: Id2ac5a7049ab783cda0f53ccca4ded9a37ced788
William Roberts [Sat, 10 Dec 2016 00:35:55 +0000 (00:35 +0000)]
fs_config: android_id header generator am:
d7104bca65 am:
04fdcc9edf
am:
343bee6044
Change-Id: I2594c976cecdf72592112697e5c31efd3a1fb75c
William Roberts [Sat, 10 Dec 2016 00:35:48 +0000 (00:35 +0000)]
fs_config: support parsing android_filesystem_config.h am:
64edf5bb97 am:
ca3dbe4ab8
am:
5302f1815c
Change-Id: I17197d4bba0a22719647966bbfa789278a31b5da
William Roberts [Sat, 10 Dec 2016 00:35:41 +0000 (00:35 +0000)]
fs_config: modularize fs_config_generator am:
11c29283ec am:
ce24636551
am:
6ebc4026a7
Change-Id: I8cf03f48ac2c799c71d62b951e26793faadad336