diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-11-10 08:06:29 +0000 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2015-11-10 08:06:29 +0000 |
| commit | 30b5d2a334a98b402ee5ed4b761806cee6cb1496 (patch) | |
| tree | ee961c6c30f0aa9441d8c76e27f32bea55bc5e37 | |
| parent | 358aecfe19949c498a6e15a22d91b624fc72338c (diff) | |
update to 6.0.0_r26 for marshmallow builds
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | android-tools/Android.mk | 6 | ||||
| -rwxr-xr-x | build.sh | 11 | ||||
| -rwxr-xr-x | sync-marshmallow-linaro.sh | 2 | ||||
| -rwxr-xr-x | sync-marshmallow-local-private.sh | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/android-tools/Android.mk b/android-tools/Android.mk index f606557..88e4df7 100644 --- a/android-tools/Android.mk +++ b/android-tools/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := adbovertcpip.sh LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) -LOCAL_SRC_FILES := adbovertcpip.sh +LOCAL_SRC_FILES := adbovertcpip.sh LOCAL_MODULE_TAGS := debug include $(BUILD_PREBUILT) @@ -12,8 +12,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := adbroot.sh LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES) -LOCAL_SRC_FILES := adbroot.sh +LOCAL_SRC_FILES := adbroot.sh LOCAL_MODULE_TAGS := debug include $(BUILD_PREBUILT) -include $(LOCAL_PATH)/sl/Android.mk \ +#include $(LOCAL_PATH)/sl/Android.mk \ @@ -59,10 +59,18 @@ function build_flounder(){ targets="selinuxtarballs" } +function build_flo(){ + export TARGET_PREBUILT_KERNEL=device/asus/flo-kernel/kernel + targets="droidcore" + build aosp_flo + unset TARGET_PREBUILT_KERNEL + targets="selinuxtarballs" +} + function build_vexpress(){ export TARGET_UEFI_TOOLS=arm-eabi- build vexpress - unset TARGET_UEFI_TOOLS + unset TARGET_UEFI_TOOLS } function build_tools_ddmlib(){ @@ -94,3 +102,4 @@ function build_tools_ddmlib(){ #build juno build_hikey #build_flounder +#build_flo diff --git a/sync-marshmallow-linaro.sh b/sync-marshmallow-linaro.sh index fb3c277..8d0c38d 100755 --- a/sync-marshmallow-linaro.sh +++ b/sync-marshmallow-linaro.sh @@ -4,7 +4,7 @@ export BASE=$(cd $(dirname $0);pwd) source ${BASE}/scripts-common/sync-common.sh export MIRROR="http://android.git.linaro.org/git/platform/manifest.git" -branch="android-6.0.0_r1" +branch="android-6.0.0_r26" LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git" LOCAL_MANIFEST_BRANCH="linaro-marshmallow" diff --git a/sync-marshmallow-local-private.sh b/sync-marshmallow-local-private.sh index 9c1a95c..0b1745e 100755 --- a/sync-marshmallow-local-private.sh +++ b/sync-marshmallow-local-private.sh @@ -4,7 +4,7 @@ export BASE=$(cd $(dirname $0);pwd) source ${BASE}/scripts-common/sync-common.sh export MIRROR="/SATA3/aosp-mirror/platform/manifest.git" -branch="android-6.0.0_r1" +branch="android-6.0.0_r26" LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git" LOCAL_MANIFEST_BRANCH="linaro-marshmallow" |