some improvements for n-preview syncn-preview

Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

5 files changed, 19 insertions, 17 deletions

diff --git a/android-tools/Android.mk b/android-tools/Android.mk
index 285e326..8a900b0 100644
--- a/android-tools/Android.mk
+++ b/android-tools/Android.mk
@@ -1,4 +1,3 @@
-ifeq ($(INCLUDE_PERSONAL_TOOLS), true)
 TOP_PATH := $(call my-dir)
 
 LOCAL_PATH := $(call my-dir)
@@ -18,6 +17,7 @@ LOCAL_SRC_FILES := adbroot.sh
 LOCAL_MODULE_TAGS := debug
 include $(BUILD_PREBUILT)
 
+ifeq ($(INCLUDE_PERSONAL_TOOLS), true)
 -include $(TOP_PATH)/sl/Android.mk
 -include $(TOP_PATH)/static-binary/src/Android.mk
 -include $(TOP_PATH)/apks/Android.mk
diff --git a/android-tools/hikey/hikey-deploy.sh b/android-tools/hikey/hikey-deploy.sh
index 6e2ccba..b982794 100755
--- a/android-tools/hikey/hikey-deploy.sh
+++ b/android-tools/hikey/hikey-deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-sudo fastboot flash boot  out/target/product/hikey/boot_fat.uefi.img 
-sudo fastboot flash system out/target/product/hikey/system.img 
-sudo fastboot flash cache out/target/product/hikey/cache.img 
-sudo fastboot flash userdata out/target/product/hikey/userdata.img 
+fastboot flash -u boot  out/target/product/hikey/boot_fat.uefi.img
+fastboot flash -u system out/target/product/hikey/system.img
+fastboot flash -u cache out/target/product/hikey/cache.img
+fastboot flash -u userdata out/target/product/hikey/userdata.img
 fastboot reboot
diff --git a/build.sh b/build.sh
index afbfb3c..5f66516 100755
--- a/build.sh
+++ b/build.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
 CPUS=$(grep processor /proc/cpuinfo |wc -l)
+#CPUS=1
 
 targets="selinuxtarballs"
 #targets="boottarball"
 variant="userdebug"
 
-#export INCLUDE_STLPORT_FOR_MASTER=true
-#export INCLUDE_LAVA_HACK_FOR_MASTER=true
 #export TARGET_GCC_VERSION_EXP=5.3-linaro
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/
-export PATH=${JAVA_HOME}/bin:$PATH
+#export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64/
+#export PATH=${JAVA_HOME}/bin:$PATH
+export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/"
+export JRE_HOME="${JAVA_HOME}/jre"
+export PATH=${JAVA_HOME}/bin:${JRE_HOME}/bin:${PATH}
 
 export WITH_DEXPREOPT=true
 
diff --git a/liuyq-patches/liuyq.xml b/liuyq-patches/liuyq.xml
index d972cbf..8eaa38e 100644
--- a/liuyq-patches/liuyq.xml
+++ b/liuyq-patches/liuyq.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
   <remote name="github4liuyq" fetch="https://github.com/" />
-  <remote name="local" fetch="file:////SATA3/aosp-mirror/hikey/" />
 <!--
   <remote name="linaro-android" fetch="git://android-git.linaro.org/" review="android-review.linaro.org" />
 
@@ -29,8 +28,4 @@
   <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.3-linaro" />
   <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.3-linaro"  />
   -->
-<!--
-  <remove-project name="linux" remote="github-hikey"/>
-  <project path="kernel/linaro/hisilicon" name="linux" revision="android-hikey-linaro-4.1" remote="local"/>
--->
 </manifest>
diff --git a/sync-local.sh b/sync-local.sh
index 5dd3dbf..d32b5e2 100755
--- a/sync-local.sh
+++ b/sync-local.sh
@@ -3,8 +3,14 @@ export BASE=$(cd $(dirname $0);pwd)
 
 source ${BASE}/scripts-common/sync-common.sh
 
-export MIRROR="/SATA3/aosp-mirror/platform/manifest.git"
-branch="android-n-preview-2"
+if [ -d /SATA3/aosp-mirror/platform/manifest.git ]; then
+    export MIRROR="/SATA3/aosp-mirror/platform/manifest.git"
+elif [ -d /home/yongqin.liu/aosp-mirror/platform/manifest.git ]; then
+    export MIRROR="/home/yongqin.liu/aosp-mirror/platform/manifest.git"
+else
+    echo "Please specify value for MIRROR"
+fi
+branch="android-n-preview-3"
 
 LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git"
 LOCAL_MANIFEST_BRANCH="linaro-n-preview"
@@ -16,7 +22,6 @@ ${BASE}/sync-projects.sh  build \
                           android-patchsets \
                           device/linaro/hikey \
                           kernel/linaro/hisilicon/ \
-                          art \
                           frameworks/base
 #                          external/opencv-upstream \