OSDN Git Service
dcashman [Thu, 15 Dec 2016 20:40:10 +0000 (20:40 +0000)]
Split mac_permissions.xml into plat and non-plat components. am:
15171f641e
am:
f976eae6f3
Change-Id: I09424929985bfeff10c14853e89af2ae8ac9f9e8
dcashman [Thu, 15 Dec 2016 20:26:40 +0000 (20:26 +0000)]
Split mac_permissions.xml into plat and non-plat components.
am:
15171f641e
Change-Id: Ic2ad780d79f58d8fcffffcae7e3aaefda5b4be4f
dcashman [Wed, 14 Dec 2016 21:48:48 +0000 (13:48 -0800)]
Split mac_permissions.xml into plat and non-plat components.
Bug:
31363362
Test: Bullhead and Sailfish both build and boot w/out new denials.
Change-Id: Id7e29ec09510741c4e925231401a6de81704fbf0
Dan Willemsen [Thu, 15 Dec 2016 07:34:41 +0000 (07:34 +0000)]
Merge "Remove variables exported by Soong" am:
f61205d5c7
am:
da8f49522d
Change-Id: I09c678146df1537df9e0f02eb112db031374f04c
Dan Willemsen [Thu, 15 Dec 2016 07:27:36 +0000 (07:27 +0000)]
Merge "Remove variables exported by Soong"
am:
f61205d5c7
Change-Id: I2140a80261c0062e220656e6017b3142d486176f
Dan Willemsen [Thu, 15 Dec 2016 07:27:35 +0000 (07:27 +0000)]
Merge "Don't clean generated java sources when AIDL list changes" am:
e9c4079e91
am:
c29cf6efb6
Change-Id: I678611486f3f7c2951a02722224d3bbabae49e8b
Treehugger Robot [Thu, 15 Dec 2016 07:19:03 +0000 (07:19 +0000)]
Merge "Remove variables exported by Soong"
Dan Willemsen [Thu, 15 Dec 2016 07:13:05 +0000 (07:13 +0000)]
Merge "Don't clean generated java sources when AIDL list changes"
am:
e9c4079e91
Change-Id: I854de56628e16c12a771f18423274e5409ee374b
Treehugger Robot [Thu, 15 Dec 2016 07:01:12 +0000 (07:01 +0000)]
Merge "Don't clean generated java sources when AIDL list changes"
Dan Willemsen [Thu, 15 Dec 2016 03:53:54 +0000 (19:53 -0800)]
Don't clean generated java sources when AIDL list changes
AIDL doesn't generate into the intermediate src directory, we pass exact
aidl->java files to the compiler. So there is no need to clean the
intermediate src directory when the aidl file list changes for a module.
Test: None, just code inspection
Change-Id: I01feff7cc399ac5b88b83333a1ac86928d0a81e6
Dan Willemsen [Thu, 15 Dec 2016 00:45:09 +0000 (00:45 +0000)]
Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert" am:
d3cc4950f8
am:
bfedf05812
Change-Id: Ic1b4310f3eec77d1dd193589f05f19e1232ed68f
Dan Willemsen [Thu, 15 Dec 2016 00:38:40 +0000 (00:38 +0000)]
Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert"
am:
d3cc4950f8
Change-Id: Ie22b04f74b035bfbe1985dbb1f5bc82e43d50e4a
Dan Willemsen [Thu, 15 Dec 2016 00:30:03 +0000 (00:30 +0000)]
Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert"
Dan Willemsen [Wed, 14 Dec 2016 23:54:01 +0000 (15:54 -0800)]
Remove variables exported by Soong
LLVM_RELEASE_VERSION is unused from envsetup.sh and during product
config loading. LLVM_PREBUILTS_VERSION is still used in envsetup.sh, so
needs to stay.
Delay reading core/clang/config.mk until after Soong's variables are
read so that we don't need a copy of LLVM_PREBUILTS_BASE.
Test: Compare build-aosp_flounder.ninja
Change-Id: I85b5836a2230838c8f3766fb19c6108fc5c9ca50
Alex Klyubin [Wed, 14 Dec 2016 23:54:36 +0000 (23:54 +0000)]
Merge "Faster auto-detection of APK's minSdkVersion" am:
620686f3c6
am:
1f5e43cb6f
Change-Id: Ic6e4f9ba7941b45a166f75e49d85b951055a42e4
Alex Klyubin [Wed, 14 Dec 2016 23:48:06 +0000 (23:48 +0000)]
Merge "Faster auto-detection of APK's minSdkVersion"
am:
620686f3c6
Change-Id: Idc1d55388577032f009027170fcf69e72666b793
Alex Klyubin [Wed, 14 Dec 2016 23:42:13 +0000 (23:42 +0000)]
Merge "Faster auto-detection of APK's minSdkVersion"
Tao Bao [Wed, 14 Dec 2016 21:06:56 +0000 (21:06 +0000)]
Merge "releasetools: Add prefix when dumping fingerprints." am:
a282ceeb73
am:
bf9e4aa53f
Change-Id: I34c65b0de83c16630c576a2f25488bb0b13f5fb9
Tao Bao [Wed, 14 Dec 2016 21:00:25 +0000 (21:00 +0000)]
Merge "releasetools: Add prefix when dumping fingerprints."
am:
a282ceeb73
Change-Id: I233432e2a64cc52409129a8ef628461f31e700c9
Alex Klyubin [Tue, 13 Dec 2016 02:19:17 +0000 (18:19 -0800)]
Faster auto-detection of APK's minSdkVersion
Prior to this change, when signing APKs, the build system invoked
'aapt dump badging' on each APK, to detect the value to pass into
signapk as --min-sdk-version. Now that signapk uses the apksig
library, it can auto-detect that value on its own, thus avoiding the
need to invoke 'aapt dump badging' and thus speeding up the build
process.
The semantics of signapk's --min-sdk-version flag is changed by this
commit from having the default value of 0 to having the default value
of "auto-detect from APK".
P.S. The get-package-min-sdk-version-int is not removed from
core/definitions.mk in this commnit, because this function is used in
another project's .mk file and thus that .mk file needs to be modified
first.
Test: rm -Rf out/ && make
Change-Id: I0972fcf0abbde9cbf6794e6c05c743c77c8a78f9
Treehugger Robot [Wed, 14 Dec 2016 20:53:02 +0000 (20:53 +0000)]
Merge "releasetools: Add prefix when dumping fingerprints."
Tao Bao [Wed, 14 Dec 2016 19:53:38 +0000 (11:53 -0800)]
releasetools: Add prefix when dumping fingerprints.
We used to dump "Source: <fingerprint>" in update logs. The "Source: "
prefix was unintentionally dropped out.
Test: Check the generated incremental BBOTA script.
Change-Id: I4de62333aa38e3fb09a76df0e769b62af48e0313
Dan Willemsen [Wed, 14 Dec 2016 04:08:57 +0000 (04:08 +0000)]
Merge "Implement LOCAL_TEST_DATA to ship data with tests" am:
dd0e69d47f
am:
04cf52edab
Change-Id: I49c20d55c5fd7af70b536b530d3a747e788e3931
Dan Willemsen [Wed, 14 Dec 2016 04:02:27 +0000 (04:02 +0000)]
Merge "Implement LOCAL_TEST_DATA to ship data with tests"
am:
dd0e69d47f
Change-Id: I48e88dde1e93d25a4981036e952eddac669f99f3
Treehugger Robot [Wed, 14 Dec 2016 03:52:31 +0000 (03:52 +0000)]
Merge "Implement LOCAL_TEST_DATA to ship data with tests"
Dan Willemsen [Wed, 14 Dec 2016 02:28:33 +0000 (18:28 -0800)]
Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert
Soong only supports exporting include directories under the current
directory. So bring non-local directories up as a potential problem in
soong_to_convert.txt
Test: m -j $OUT/soong_to_convert.txt, inspect
Change-Id: I7a15b92e10a1d8b8d3496c6f0529a0d0824f301e
Dan Willemsen [Sat, 10 Dec 2016 00:05:09 +0000 (16:05 -0800)]
Implement LOCAL_TEST_DATA to ship data with tests
This can be used to ship source data as test artifacts next to native
tests. It works for both local builds and the test bundles using
package_modules.mk.
You just specify a file list relative to the local directory, and those
files will be copied next to the executable under
/data/nativetest*/<module>/...:
LOCAL_MODULE := mytest
LOCAL_TEST_DATA := data/file1 file2
/data/nativetest/mytest/mytest
/data/nativetest/mytest/data/file1
/data/nativetest/mytest/file2
If the data is in another directory, you may also specify a different
prefix for the source files:
LOCAL_TEST_DATA := external/skia:resources/f.xml
/data/nativetest/skia_test/resources/f.xml
And there's a new convenience macro to find a list of files in this
format:
LOCAL_TEST_DATA := $(call find-test-data-in-subdirs,external/skia,"*.xml",resources)
I'll expand this to native benchmarks and fuzz tests in a later change,
since they don't have their own module classes yet.
Bug:
30564705
Test: m -j minikin_tests; ls $OUT/data/nativetest*/minikin_tests
Test: m -j continuous_native_tests dist; zipinfo -1 out/dist/*continuous_native_tests*.zip
Change-Id: Ic76a7b62e7f567f259c4ab1510ee97d26600ba9a
Adam Seaton [Wed, 14 Dec 2016 00:40:54 +0000 (00:40 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev am:
cb4af5774a am:
a74871cfd3 am:
32e254e258
am:
2d08201d3b
Change-Id: I783aefe051f60100dff27cad415108cd693869e0
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:23 +0000 (00:34 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev am:
cb4af5774a am:
a74871cfd3
am:
32e254e258
Change-Id: I7b9e67e87349a4646ab25a413e018dc98b53f3f2
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:53 +0000 (00:27 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev am:
cb4af5774a
am:
a74871cfd3
Change-Id: I3e8c5deed8589c1778a1e09e975d2f8ef038b627
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:18 +0000 (00:21 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev
am:
cb4af5774a
Change-Id: If8a397d3d3bfdf5bb6787aa76c1fb1b0fadfcd9d
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
Adam Seaton [Wed, 14 Dec 2016 00:16:17 +0000 (00:16 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev
* changes:
Update Security String to 2017-02-05 on nyc-dev
Update Security String to 2017-02-01 on nyc-dev
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
OSDN Git Service
