git.osdn.net Git - android-x86/build.git/log

Joe LaPenna [Fri, 16 Dec 2016 20:51:02 +0000 (20:51 +0000)]

Merge "Add default NetworkRecommendation to core.mk" am: 95f616b960 am: f4251ee777
am: e07d894eb5

Change-Id: Id652ac50d15879466431cc01083e771f92044cc2

commit | commitdiff | tree

Joe LaPenna [Fri, 16 Dec 2016 20:43:06 +0000 (20:43 +0000)]

Merge "Add default NetworkRecommendation to core.mk" am: 95f616b960
am: f4251ee777

Change-Id: I95ab94b579c4e72f685bcfc2d7b68127dbc060e8

commit | commitdiff | tree

Joe LaPenna [Fri, 16 Dec 2016 20:35:04 +0000 (20:35 +0000)]

Merge "Add default NetworkRecommendation to core.mk"
am: 95f616b960

Change-Id: Ice21caa64e01e15911d9f5979cd0db345e5686f1

commit | commitdiff | tree

Treehugger Robot [Fri, 16 Dec 2016 20:23:47 +0000 (20:23 +0000)]

Merge "Add default NetworkRecommendation to core.mk"

commit | commitdiff | tree

Joe LaPenna [Thu, 8 Dec 2016 00:06:43 +0000 (16:06 -0800)]

Add default NetworkRecommendation to core.mk

This makes the apk avaiable on all devices and can be overridden on a
per-product basis using LOCAL_OVERRIDES_PACKAGES.

BUG: 33224286
Test: Verified with lunch aosp_bullhead-userdebug; make

Change-Id: Ib345193caa4431b6405294bd8759d93349335814

commit | commitdiff | tree

Alex Klyubin [Fri, 16 Dec 2016 17:47:24 +0000 (17:47 +0000)]

Merge "aapt no longer needed for signing APKs" am: 3cfff7386f am: 2c70770e93
am: bf78cdd81e

Change-Id: I25988629bf8c0a8f2a6f8894511b199cd2d2aed4

commit | commitdiff | tree

Alex Klyubin [Fri, 16 Dec 2016 17:47:10 +0000 (17:47 +0000)]

Merge "Remove unused get-package-min-sdk-version-int" am: 5a1ba84c30 am: 24b383a770
am: 176a27a7a2

Change-Id: Ifc7d911c981bd7f801e83653788585a2bf57abda

commit | commitdiff | tree

Alex Klyubin [Fri, 16 Dec 2016 17:38:53 +0000 (17:38 +0000)]

Merge "aapt no longer needed for signing APKs" am: 3cfff7386f
am: 2c70770e93

Change-Id: I920311adea1085830df6ed992711e26aed38c2a1

commit | commitdiff | tree

Alex Klyubin [Fri, 16 Dec 2016 17:38:40 +0000 (17:38 +0000)]

Merge "Remove unused get-package-min-sdk-version-int" am: 5a1ba84c30
am: 24b383a770

Change-Id: Iafe2ea0495e9c1b5c77eb4d995101c60e85700af

commit | commitdiff | tree

Alex Klyubin [Fri, 16 Dec 2016 17:30:23 +0000 (17:30 +0000)]

Merge "aapt no longer needed for signing APKs"
am: 3cfff7386f

Change-Id: I95e90f0c4e31fe79bb72a302bec2d89885959533

commit | commitdiff | tree

Alex Klyubin [Fri, 16 Dec 2016 17:30:09 +0000 (17:30 +0000)]

Merge "Remove unused get-package-min-sdk-version-int"
am: 5a1ba84c30

Change-Id: Id5b5c1a36f6fe6ef85f9cee12a7e49dacd416801

commit | commitdiff | tree

Alex Klyubin [Fri, 16 Dec 2016 17:21:13 +0000 (17:21 +0000)]

Merge "aapt no longer needed for signing APKs"

commit | commitdiff | tree

Alex Klyubin [Fri, 16 Dec 2016 17:20:23 +0000 (17:20 +0000)]

Merge "Remove unused get-package-min-sdk-version-int"

commit | commitdiff | tree

Vijay Venkatraman [Fri, 16 Dec 2016 02:35:02 +0000 (02:35 +0000)]

Merge "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" am: e4be608d2f am: fe371b310f
am: 94e6045271

Change-Id: I14d92f22e57ab2d701de3983b88e2a9ebbb76b5e

commit | commitdiff | tree

Vijay Venkatraman [Fri, 16 Dec 2016 02:34:47 +0000 (02:34 +0000)]

Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set." am: 823172e209 am: e9709b4575
am: f880ab9021

Change-Id: Ie6f74154c1d104effbeab74010337b9a6714a965

commit | commitdiff | tree

Vijay Venkatraman [Fri, 16 Dec 2016 02:26:34 +0000 (02:26 +0000)]

Merge "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."" am: e4be608d2f
am: fe371b310f

Change-Id: I9b086d31ef7197798d5f0a38864321622b99cccf

commit | commitdiff | tree

Vijay Venkatraman [Fri, 16 Dec 2016 02:26:19 +0000 (02:26 +0000)]

Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set." am: 823172e209
am: e9709b4575

Change-Id: I8166568b64cbda20c35fb4b07ea24ce6578158fc

commit | commitdiff | tree

Vijay Venkatraman [Fri, 16 Dec 2016 02:17:48 +0000 (02:17 +0000)]

Merge "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""
am: e4be608d2f

Change-Id: I236dd4c28d4bbe65fc51fb3fbd599a3a23129b14

commit | commitdiff | tree

Vijay Venkatraman [Fri, 16 Dec 2016 02:17:47 +0000 (02:17 +0000)]

Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."
am: 823172e209

Change-Id: If6249d3b311089ea342fb873288ad38c12bc53d1

commit | commitdiff | tree

Vijay Venkatraman [Fri, 16 Dec 2016 02:11:11 +0000 (02:11 +0000)]

Merge "Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.""

commit | commitdiff | tree

Vijay Venkatraman [Fri, 16 Dec 2016 02:08:18 +0000 (02:08 +0000)]

Revert "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."

This reverts commit 2b6c204c73b97147ec00484904ee6f4bc003cb15.

Change-Id: I60a042f2ed0c767ec3a45c31ee1b99d43891efaa

commit | commitdiff | tree

Alex Klyubin [Thu, 15 Dec 2016 20:53:58 +0000 (12:53 -0800)]

Remove unused get-package-min-sdk-version-int

The only user of get-package-min-sdk-version-int was signapk. signapk
no longer needs to be provided with the APK's minSdkVersion though.

(cherry picked from commit e185da21ca07006c5ced90e1577c0682566428de)
Test: make clean && make

Change-Id: I6867a004aec0f3752cbbc99cc30e02ca5404b3c4

commit | commitdiff | tree

Alex Klyubin [Thu, 15 Dec 2016 20:51:25 +0000 (12:51 -0800)]

aapt no longer needed for signing APKs

signapk now auto-detects the APK's minSdkVersion, removing the need to
run aapt dump badging during APK signing.

Test: make clean && make
Change-Id: Ifc74292a9900443d053e437b50b540c8d0b33dbd

commit | commitdiff | tree

Vijay Venkatraman [Thu, 15 Dec 2016 23:32:57 +0000 (23:32 +0000)]

Merge "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set." am: b777f169f8 am: fe9ba5edf4
am: d5c2437942

Change-Id: I90593084b94939c8e80e9969260cd621e15a9bfa

commit | commitdiff | tree

Vijay Venkatraman [Thu, 15 Dec 2016 23:32:41 +0000 (23:32 +0000)]

Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set. am: 2b6c204c73 am: 23da9097fe
am: a41a8d371c

Change-Id: I3f4b8498410c9cf89c913413db9818402b13ceac

commit | commitdiff | tree

Vijay Venkatraman [Thu, 15 Dec 2016 23:02:47 +0000 (23:02 +0000)]

Merge "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set." am: b777f169f8
am: fe9ba5edf4

Change-Id: I9049593af944687aea3b9c664b75a03e025c4a96

commit | commitdiff | tree

Vijay Venkatraman [Thu, 15 Dec 2016 23:02:29 +0000 (23:02 +0000)]

Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set. am: 2b6c204c73
am: 23da9097fe

Change-Id: I1724efa79766e50eaccc9cd43fa5a143494397ec

commit | commitdiff | tree

Vijay Venkatraman [Thu, 15 Dec 2016 21:37:30 +0000 (21:37 +0000)]

Merge "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."
am: b777f169f8

Change-Id: I7d0c58f2c1be9084b8a78a7fa32c9dab6eb31756

commit | commitdiff | tree

Vijay Venkatraman [Thu, 15 Dec 2016 21:37:29 +0000 (21:37 +0000)]

Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set.
am: 2b6c204c73

Change-Id: Iea702c06134f40b312c795ce13d41fa94bc62e15

commit | commitdiff | tree

Vijay Venkatraman [Thu, 15 Dec 2016 21:26:16 +0000 (21:26 +0000)]

Merge "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set."

commit | commitdiff | tree

dcashman [Thu, 15 Dec 2016 20:47:31 +0000 (20:47 +0000)]

Merge "Split mac_permissions.xml into plat and non-plat components." am: b8888197c6 am: 63a91e9ee0
am: 81fcb95744

Change-Id: Ibcf8e6618bd46069dfe50cc4059342155b565026

commit | commitdiff | tree

dcashman [Thu, 15 Dec 2016 20:47:23 +0000 (20:47 +0000)]

Split mac_permissions.xml into plat and non-plat components. am: 15171f641e am: f976eae6f3
am: eb7c416fc2

Change-Id: Idc1cbcb274c02cb533fe0d18aec9560f6a149ea1

commit | commitdiff | tree

dcashman [Thu, 15 Dec 2016 20:40:16 +0000 (20:40 +0000)]

Merge "Split mac_permissions.xml into plat and non-plat components." am: b8888197c6
am: 63a91e9ee0

Change-Id: I3f1600730dc239093fa525c854a903d583510c12

commit | commitdiff | tree

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

commit | commitdiff | tree

dcashman [Thu, 15 Dec 2016 20:27:32 +0000 (20:27 +0000)]

Merge "Split mac_permissions.xml into plat and non-plat components."
am: b8888197c6

Change-Id: Id0785ec8105d31cb8dd21780be3552588c4ce9e8

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 15 Dec 2016 20:13:28 +0000 (20:13 +0000)]

Merge "Split mac_permissions.xml into plat and non-plat components."

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Willemsen [Thu, 15 Dec 2016 07:42:56 +0000 (07:42 +0000)]

Merge "Remove variables exported by Soong" am: f61205d5c7 am: da8f49522d
am: 4f1d1d0a1e

Change-Id: I7fd64ff79923995574e0be2f361b486b3540a45d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Willemsen [Thu, 15 Dec 2016 07:27:36 +0000 (07:27 +0000)]

Merge "Remove variables exported by Soong"
am: f61205d5c7

Change-Id: I2140a80261c0062e220656e6017b3142d486176f

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 15 Dec 2016 07:19:03 +0000 (07:19 +0000)]

Merge "Remove variables exported by Soong"

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 15 Dec 2016 07:01:12 +0000 (07:01 +0000)]

Merge "Don't clean generated java sources when AIDL list changes"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alex Klyubin [Wed, 14 Dec 2016 23:42:13 +0000 (23:42 +0000)]

Merge "Faster auto-detection of APK's minSdkVersion"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 14 Dec 2016 20:53:02 +0000 (20:53 +0000)]

Merge "releasetools: Add prefix when dumping fingerprints."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 14 Dec 2016 03:52:31 +0000 (03:52 +0000)]

Merge "Implement LOCAL_TEST_DATA to ship data with tests"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dan Willemsen [Tue, 13 Dec 2016 22:22:58 +0000 (22:22 +0000)]

Merge "Sort and reorganize clear_vars.mk to make merges easier"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

build

RSS Atom

About OSDN

Find Software

Develop Software

Help