OSDN Git Service
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 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: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: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.
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: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: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: 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: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:30:25 +0000 (00:30 +0000)]
Merge changes from topic 'fsconfig-2' am:
1b2de51881
am:
82b189dcee
Change-Id: I6e643b1f61aaf7bcbc9370f6aff9543208a51bb6
William Roberts [Sat, 10 Dec 2016 00:27:04 +0000 (00:27 +0000)]
fs_config: add unit tests am:
92ec0ab5e8
am:
bd19c0cd23
Change-Id: Id449dab19635171deaac6e833e19eab991c7d831
William Roberts [Sat, 10 Dec 2016 00:26:57 +0000 (00:26 +0000)]
fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement am:
7fe8b6d817
am:
ee9af6edfb
Change-Id: Icdcd1925b0a4fb06ee255971774ad99e28908a5b
William Roberts [Sat, 10 Dec 2016 00:26:50 +0000 (00:26 +0000)]
fs_config: add group to build am:
2127b35526
am:
bdbafb5c38
Change-Id: I916ed6a4b2814c4039f6406fe1d7a49030c20f3b
William Roberts [Sat, 10 Dec 2016 00:26:43 +0000 (00:26 +0000)]
fs_config: introduce group generator am:
1c4721c3c5
am:
3315954861
Change-Id: Id672e91b493a8ca0acdae398028dc97c9be4cf17
William Roberts [Sat, 10 Dec 2016 00:26:36 +0000 (00:26 +0000)]
fs_config: add passwd to build am:
6d5e0c5df2
am:
788899790d
Change-Id: Ie13eae03872717ae193d7aba4914373b0e4a5453
William Roberts [Sat, 10 Dec 2016 00:26:29 +0000 (00:26 +0000)]
fs_config: introduce passwd generator am:
316f9462af
am:
62d75469b1
Change-Id: Ibf6e46a92371ee3f75281a97deb70e821ff03143
William Roberts [Sat, 10 Dec 2016 00:26:22 +0000 (00:26 +0000)]
fs_config: generate friendly in AID class am:
8f42ce71ac
am:
092fa031cd
Change-Id: Iabccf9d097b360ea15ee2a62700fc5199814c7dd
William Roberts [Sat, 10 Dec 2016 00:26:14 +0000 (00:26 +0000)]
fs_config: limit characters for AID_<name> sections am:
5f059a7691
am:
7fcf246c3b
Change-Id: Ia4c77315c8f85c9e5c77f4b0802facd7a8b2161a
William Roberts [Sat, 10 Dec 2016 00:26:07 +0000 (00:26 +0000)]
fs_config: generate oem AID header file am:
cfc51f5347
am:
9652abfeb4
Change-Id: Iea9bf8d8b8c5e98b199cf1413f47b5e00fa5d695
William Roberts [Sat, 10 Dec 2016 00:25:59 +0000 (00:25 +0000)]
fs_config: android_id header generator am:
d7104bca65
am:
04fdcc9edf
Change-Id: If18da87d7010c49f26743f602dffd56745278cde
William Roberts [Sat, 10 Dec 2016 00:25:52 +0000 (00:25 +0000)]
fs_config: support parsing android_filesystem_config.h am:
64edf5bb97
am:
ca3dbe4ab8
Change-Id: Ibd0d33ec543cd570300a026c33d3d76d9b44b007
William Roberts [Sat, 10 Dec 2016 00:25:44 +0000 (00:25 +0000)]
fs_config: modularize fs_config_generator am:
11c29283ec
am:
ce24636551
Change-Id: Icc16415fe5896e5b9b081c98b60d2ac1be302413
Elliott Hughes [Sat, 10 Dec 2016 00:23:56 +0000 (00:23 +0000)]
Merge changes from topic 'fsconfig-2'
am:
1b2de51881
Change-Id: I07622a3603986c42195089eb75e37a22cdba6517
William Roberts [Sat, 10 Dec 2016 00:21:34 +0000 (00:21 +0000)]
fs_config: add unit tests
am:
92ec0ab5e8
Change-Id: I7afc692257d31a09cd1bdcab2ed6d8835e56fa51
William Roberts [Sat, 10 Dec 2016 00:21:28 +0000 (00:21 +0000)]
fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement
am:
7fe8b6d817
Change-Id: Ie209bc0f1696ffdc5f167d229fc9f5378f8feb24
William Roberts [Sat, 10 Dec 2016 00:21:23 +0000 (00:21 +0000)]
fs_config: add group to build
am:
2127b35526
Change-Id: Icf5e4946bb6d53f2c8080a1327543ffb5a59531c
William Roberts [Sat, 10 Dec 2016 00:21:17 +0000 (00:21 +0000)]
fs_config: introduce group generator
am:
1c4721c3c5
Change-Id: I2eccb5f0d39a3740f540b683fb332df405728c4f
William Roberts [Sat, 10 Dec 2016 00:21:12 +0000 (00:21 +0000)]
fs_config: add passwd to build
am:
6d5e0c5df2
Change-Id: Ie912558d2258b3996fc4a5864f2c72e9781a3e62
William Roberts [Sat, 10 Dec 2016 00:21:07 +0000 (00:21 +0000)]
fs_config: introduce passwd generator
am:
316f9462af
Change-Id: I9c4c7b5fb1c384b97bf2be09a1d4d683c56c662d
William Roberts [Sat, 10 Dec 2016 00:21:02 +0000 (00:21 +0000)]
fs_config: generate friendly in AID class
am:
8f42ce71ac
Change-Id: I958aa6152a2b42bb7a82fe1e909fc911a08b2f36
William Roberts [Sat, 10 Dec 2016 00:20:57 +0000 (00:20 +0000)]
fs_config: limit characters for AID_<name> sections
am:
5f059a7691
Change-Id: Ie5be98d61bc5920dbe2055f0432b94a3b1c07110
William Roberts [Sat, 10 Dec 2016 00:20:51 +0000 (00:20 +0000)]
fs_config: generate oem AID header file
am:
cfc51f5347
Change-Id: I540683cf1b648ec7445ab204c2bf9ccaf396943e
William Roberts [Sat, 10 Dec 2016 00:20:46 +0000 (00:20 +0000)]
fs_config: android_id header generator
am:
d7104bca65
Change-Id: I96a721690d4e145aa859c5c23e3e892e9ce983c9
William Roberts [Sat, 10 Dec 2016 00:20:41 +0000 (00:20 +0000)]
fs_config: support parsing android_filesystem_config.h
am:
64edf5bb97
Change-Id: I95702e7e4ccefc9cb5c71710a8e8f2d5b3fbff80
William Roberts [Sat, 10 Dec 2016 00:20:35 +0000 (00:20 +0000)]
fs_config: modularize fs_config_generator
am:
11c29283ec
Change-Id: I3383ea79aded814c16d53bc18b36c27810f26163
Elliott Hughes [Sat, 10 Dec 2016 00:13:04 +0000 (00:13 +0000)]
Merge changes from topic 'fsconfig-2'
* changes:
fs_config: add unit tests
fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement
fs_config: add group to build
fs_config: introduce group generator
fs_config: add passwd to build
fs_config: introduce passwd generator
fs_config: generate friendly in AID class
fs_config: limit characters for AID_<name> sections
fs_config: generate oem AID header file
fs_config: android_id header generator
fs_config: support parsing android_filesystem_config.h
fs_config: modularize fs_config_generator
Colin Cross [Fri, 9 Dec 2016 23:05:51 +0000 (23:05 +0000)]
Merge "Add more module targets for host, host-cross, host32, host64" am:
77ea32f378
am:
3ae5fc64bf
Change-Id: I7f5475de0c3c415ffca2629b835a6012a3bb4897
Colin Cross [Fri, 9 Dec 2016 22:59:50 +0000 (22:59 +0000)]
Merge "Add more module targets for host, host-cross, host32, host64"
am:
77ea32f378
Change-Id: I2d0b355290235842f1d033a90645d6c071864c4b
Treehugger Robot [Fri, 9 Dec 2016 22:54:59 +0000 (22:54 +0000)]
Merge "Add more module targets for host, host-cross, host32, host64"
Colin Cross [Fri, 9 Dec 2016 21:08:27 +0000 (13:08 -0800)]
Add more module targets for host, host-cross, host32, host64
Previously, clang-host would build the clang module for 32-bit and
64-bit for the host and for windows. Make clang-host only compile
for host, and add clang-host-cross for windows. Also add targets
that only build 32-bit or 64-bit: clang-host32, clang-host64,
clang-host-cross32, clang-host-cross64, clang-target32, and
clang-target64.
Test: inspect build.ninja
Change-Id: I7676f9497dfc852f2a0255dda8da06c88eec0db8
Paul Duffin [Fri, 9 Dec 2016 15:21:45 +0000 (15:21 +0000)]
Use legacy-test instead of core-junit
The core-junit library has been replaced with the legacy-test
library. The latter included everything that was in core-junit
plus some android.test classes that were in frameworks.
Bug:
30188076
Test: make checkbuild
Change-Id: Id2ba827705dbd2c27a1183e1153b03c11a8a4074
Colin Cross [Thu, 8 Dec 2016 23:52:01 +0000 (23:52 +0000)]
Merge "Pass eng product varible to soong" am:
b39165d5df
am:
c645e17388
Change-Id: Id4a4d650d784a55d26b3d3aa22111c4dc5acde84
Colin Cross [Thu, 8 Dec 2016 23:47:04 +0000 (23:47 +0000)]
Merge "Pass eng product varible to soong"
am:
b39165d5df
Change-Id: I88acb79aaa12ec9ea2ac0847abf7f8406ccb479d
Colin Cross [Thu, 8 Dec 2016 23:42:16 +0000 (23:42 +0000)]
Merge "Pass eng product varible to soong"
Adam Seaton [Thu, 8 Dec 2016 19:25:17 +0000 (19:25 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33 am:
920376a35a
am:
5260c53a72
Change-Id: Ic5680e80d403f77c5b45d59d74139f142572bb2f
Adam Seaton [Thu, 8 Dec 2016 19:25:10 +0000 (19:25 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e am:
39fc3e057b
am:
d23021bb6a
Change-Id: I5209e73495eae704c1a1ce9441f556ed37624561
Adam Seaton [Thu, 8 Dec 2016 19:20:16 +0000 (19:20 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e am:
ab8c6b7e33
am:
920376a35a
Change-Id: I9eb5927b353df59bc2f4d6ca9b8b0959fa605185
Adam Seaton [Thu, 8 Dec 2016 19:20:10 +0000 (19:20 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371 am:
7ab9da0e3e
am:
39fc3e057b
Change-Id: I3319a70c835fcc6f4caec0f0f331c80b0bfff849
Adam Seaton [Thu, 8 Dec 2016 19:16:48 +0000 (19:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours am:
80d094259e
am:
ab8c6b7e33
Change-Id: I08505a341bce3869628b6f09157332bf5bb0d1d5
Adam Seaton [Thu, 8 Dec 2016 19:16:40 +0000 (19:16 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours am:
4758581371
am:
7ab9da0e3e
Change-Id: Icc44a43eefe8db0fcd9191b10ce6e2517ce56f99
Adam Seaton [Thu, 8 Dec 2016 19:11:15 +0000 (19:11 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87 am:
31bc4666be -s ours
am:
80d094259e
Change-Id: I90763143c525a186c503abccc6f710fb851d72b6
Adam Seaton [Thu, 8 Dec 2016 19:11:10 +0000 (19:11 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7 am:
0c30223c15 -s ours
am:
4758581371
Change-Id: Ib67b4e7043da863341e0e9d2f79a3e9fed0a7351
Adam Seaton [Thu, 8 Dec 2016 19:06:44 +0000 (19:06 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-05 on mnc-dev am:
06e7d1f2ac am:
4e1976ff9b am:
7a2ca27f87
am:
31bc4666be -s ours
Change-Id: I0ec36bbce6a7ec254360eb3133f99813b5de5aa0
Adam Seaton [Thu, 8 Dec 2016 19:06:39 +0000 (19:06 +0000)]
[DO NOT MERGE] Update Security String to 2017-02-01 on mnc-dev am:
f92880e0c7 am:
6083d8337c am:
e76d1419c7
am:
0c30223c15 -s ours
Change-Id: I9a6046de21e024e5f3378047411e5270881aa2d3
OSDN Git Service
