OSDN Git Service
Dan Willemsen [Thu, 15 Dec 2016 07:42:39 +0000 (07:42 +0000)]
Merge "Don't clean generated java sources when AIDL list changes" am:
e9c4079e91 am:
c29cf6efb6
am:
b8338be5dc
Change-Id: I54ab92bf99301999756c9532f1819025f08cd673
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
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:52:42 +0000 (00:52 +0000)]
Merge "Identify non-local EXPORT_C_INCLUDE_DIRS in soong_to_convert" am:
d3cc4950f8 am:
bfedf05812
am:
4d08538747
Change-Id: I965820dd9cb60dabd5e5cf255630d888f216ea11
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"
Alex Klyubin [Thu, 15 Dec 2016 00:02:37 +0000 (00:02 +0000)]
Merge "Faster auto-detection of APK's minSdkVersion" am:
620686f3c6 am:
1f5e43cb6f
am:
9d439f54b1
Change-Id: Ia481bba8525e07d016879f88ae2a2c3e40cc1da6
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:14:29 +0000 (21:14 +0000)]
Merge "releasetools: Add prefix when dumping fingerprints." am:
a282ceeb73 am:
bf9e4aa53f
am:
aff4efc8c1
Change-Id: I33ae138b3d3473787d110da1b516de4ac934af2d
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:16:27 +0000 (04:16 +0000)]
Merge "Implement LOCAL_TEST_DATA to ship data with tests" am:
dd0e69d47f am:
04cf52edab
am:
1f7aae0ac2
Change-Id: I1c11d306501dfd505f48a8d1dc5ede65d2c21520
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
Android Build Merger (Role) [Wed, 14 Dec 2016 00:47:18 +0000 (00:47 +0000)]
Merge changes from topic 'am-
9c27e6a6873d4faa9ae3bdcdf06606ad' into nyc-mr2-dev-plus-aosp
* changes:
Merge changes I761c90cd,I0e2dd0af into nyc-dev am:
cb4af5774a am:
a74871cfd3 am:
32e254e258 am:
2d08201d3b am:
0e9ae8095b
Update Security String to 2017-02-05 on nyc-dev am:
af63566009 am:
f6dbc77231 am:
dec80c416e am:
89e9059995 am:
94fbbd200e
Update Security String to 2017-02-01 on nyc-dev am:
35901a7fd0 am:
eaf4508b09 am:
2cc397f4c5 am:
548f3ec0d3 am:
0dd5eff86c
Adam Seaton [Wed, 14 Dec 2016 00:46:56 +0000 (00:46 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev am:
cb4af5774a am:
a74871cfd3 am:
32e254e258 am:
2d08201d3b
am:
0e9ae8095b
Change-Id: Ic4d03b483b5ce60e2d917bd645468a45817389c3
Adam Seaton [Wed, 14 Dec 2016 00:46:55 +0000 (00:46 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev am:
cb4af5774a am:
a74871cfd3 am:
32e254e258 am:
2d08201d3b
am:
f474420719
Change-Id: If72a88d385b4d4b8c0542e367d720367d0e0bdde
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:49 +0000 (00:46 +0000)]
Update Security String to 2017-02-05 on nyc-dev am:
af63566009 am:
f6dbc77231 am:
dec80c416e am:
89e9059995
am:
7b86c49b95
Change-Id: I26116859fa0c0f8b0e07222db491cb2eefd3dfa9
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: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:
2af57857b8
Change-Id: I82e29fb23b492962b56659ff2e292c71a6989b10
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:54 +0000 (00:40 +0000)]
Merge changes I761c90cd,I0e2dd0af into nyc-dev am:
cb4af5774a am:
a74871cfd3 am:
32e254e258
am:
2d08201d3b
Change-Id: I7d1032bd9d9dfbc2ba3c9b649b09347a2f87ecd1
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: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: Id11cb447d0331a8643793b932537cb7a154fffb9
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: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: I4234646b649f205b257047550b280358ab8f7711
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: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