Elliott Hughes
57cc36a33b
Merge "Revert "Merge changes from topic 'fsconfig-2'""
...
am: 95cee3b0e6
2016-12-13 04:34:09 +00:00
Elliott Hughes
e472384a4b
Revert "Merge changes from topic 'fsconfig-2'"
...
am: fad4b4b715
2016-12-13 04:34:07 +00:00
Elliott Hughes
95cee3b0e6
Merge "Revert "Merge changes from topic 'fsconfig-2'""
2016-12-13 04:23:50 +00:00
Dan Willemsen
05ebf54158
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 3ea1a05917
2016-12-12 19:07:59 -08:00
Elliott Hughes
fad4b4b715
Revert "Merge changes from topic 'fsconfig-2'"
...
This reverts commit 1b2de5188177ea32f378
2016-12-12 17:28:44 -08:00
Adam Seaton
fea1d52df2
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
2016-12-12 18:59:44 +00:00
Adam Seaton
7e05ac5723
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
2016-12-12 18:59:36 +00:00
Adam Seaton
6668275ddf
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
2016-12-12 18:59:09 +00:00
Adam Seaton
24378595e4
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
2016-12-12 18:59:01 +00:00
Adam Seaton
4b2829e580
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
2016-12-12 18:53:10 +00:00
Adam Seaton
0a62746b5e
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
2016-12-12 18:53:03 +00:00
Adam Seaton
53cd7ebd83
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
2016-12-12 18:52:38 +00:00
Adam Seaton
555baa4d6d
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
2016-12-12 18:52:31 +00:00
Adam Seaton
f99b74b718
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
2016-12-12 18:46:44 +00:00
Adam Seaton
6e4e6c168e
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
2016-12-12 18:46:34 +00:00
Adam Seaton
09f08e2ded
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
2016-12-12 18:46:10 +00:00
Adam Seaton
f840599ac2
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
2016-12-12 18:46:00 +00:00
Adam Seaton
dd58f8a897
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
2016-12-12 18:40:09 +00:00
Adam Seaton
79a86d157a
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
2016-12-12 18:40:02 +00:00
Adam Seaton
3270d73dc0
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
2016-12-12 18:39:37 +00:00
Adam Seaton
72aef1bed8
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
2016-12-12 18:39:30 +00:00
Adam Seaton
31fffa19e3
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
2016-12-12 18:33:43 +00:00
Adam Seaton
4fde436775
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
2016-12-12 18:33:36 +00:00
Adam Seaton
76d6a87a5d
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
2016-12-12 18:33:07 +00:00
Adam Seaton
af617a8560
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
2016-12-12 18:33:00 +00:00
Adam Seaton
6a991fcc71
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
2016-12-12 18:28:01 +00:00
Adam Seaton
ad296afa4c
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
2016-12-12 18:27:56 +00:00
Adam Seaton
533221ff49
Update Security String to 2017-02-05 in lmp-dev am: fd48c0bf99 am: 63131f2e9e am: 6a8a7ef480 -s ours am: 6671100ef9 am: de5e2a48e9
...
am: 2eeaa80336
2016-12-12 18:27:33 +00:00
Adam Seaton
78cdf4fd07
Update Security String to 2017-02-01 in lmp-dev am: 19717dff7c am: 36d8423804 am: ca32812b01 -s ours am: 2e720eba5f am: c8d8647e37
...
am: 8e5abe38c0
2016-12-12 18:27:28 +00:00
Adam Seaton
b4bce92c76
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
2016-12-12 18:22:02 +00:00
Adam Seaton
71a1639a8b
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
2016-12-12 18:21:57 +00:00
Adam Seaton
2eeaa80336
Update Security String to 2017-02-05 in lmp-dev am: fd48c0bf99 am: 63131f2e9e am: 6a8a7ef480 -s ours am: 6671100ef9
...
am: de5e2a48e9
2016-12-12 18:21:33 +00:00
Adam Seaton
8e5abe38c0
Update Security String to 2017-02-01 in lmp-dev am: 19717dff7c am: 36d8423804 am: ca32812b01 -s ours am: 2e720eba5f
...
am: c8d8647e37
2016-12-12 18:21:28 +00:00
Adam Seaton
9021a3cca1
Updating Security String to 2017-02-05 in klp-dev am: 7078534eb1 am: 96ff32285e am: 5e8584b7e2 am: 6c8027f02c am: f9a9de85c0 am: cff982d693
...
am: f82e3fcdd5
2016-12-12 18:15:08 +00:00
Adam Seaton
647c853775
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
2016-12-12 18:15:02 +00:00
Adam Seaton
de5e2a48e9
Update Security String to 2017-02-05 in lmp-dev am: fd48c0bf99 am: 63131f2e9e am: 6a8a7ef480 -s ours
...
am: 6671100ef9
2016-12-12 18:14:33 +00:00
Adam Seaton
c8d8647e37
Update Security String to 2017-02-01 in lmp-dev am: 19717dff7c am: 36d8423804 am: ca32812b01 -s ours
...
am: 2e720eba5f
2016-12-12 18:14:28 +00:00
Adam Seaton
f82e3fcdd5
Updating Security String to 2017-02-05 in klp-dev am: 7078534eb1 am: 96ff32285e am: 5e8584b7e2 am: 6c8027f02c am: f9a9de85c0
...
am: cff982d693
2016-12-12 18:09:34 +00:00
Adam Seaton
34eec6554f
Update Security String to 2017-02-01 in klp-dev am: b1a7ec0841 am: 5c99964c63 am: ce2b665128 -s ours am: 2c827418dd am: 380ba6deec
...
am: 9baf1b5294
2016-12-12 18:09:28 +00:00
Adam Seaton
6671100ef9
Update Security String to 2017-02-05 in lmp-dev am: fd48c0bf99 am: 63131f2e9e
...
am: 6a8a7ef480
2016-12-12 18:09:02 +00:00
Adam Seaton
2e720eba5f
Update Security String to 2017-02-01 in lmp-dev am: 19717dff7c am: 36d8423804
...
am: ca32812b01
2016-12-12 18:08:57 +00:00
Dan Willemsen
13a820d732
Merge "Fix PDK dupbuild issues" am: d1b10b20f6
...
am: 22c01a60e4
2016-12-10 07:27:50 +00:00
Dan Willemsen
22c01a60e4
Merge "Fix PDK dupbuild issues"
...
am: d1b10b20f6
2016-12-10 07:21:49 +00:00
Treehugger Robot
d1b10b20f6
Merge "Fix PDK dupbuild issues"
2016-12-10 07:14:12 +00:00
Dan Willemsen
e0bba6fa12
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
2016-12-09 21:15:41 -08:00
Elliott Hughes
1b827f8fd3
Merge changes from topic 'fsconfig-2' am: 1b2de51881
...
am: 82b189dcee
2016-12-10 00:30:25 +00:00
William Roberts
d04e585b89
fs_config: add unit tests am: 92ec0ab5e8
...
am: bd19c0cd23
2016-12-10 00:27:04 +00:00
William Roberts
0101f107c1
fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement am: 7fe8b6d817
...
am: ee9af6edfb
2016-12-10 00:26:57 +00:00
William Roberts
596993abb5
fs_config: add group to build am: 2127b35526
...
am: bdbafb5c38
2016-12-10 00:26:50 +00:00
William Roberts
6b50e15947
fs_config: introduce group generator am: 1c4721c3c5
...
am: 3315954861
2016-12-10 00:26:43 +00:00
