update to support local patches

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

4 files changed, 13 insertions, 10 deletions

diff --git a/host-tools/LIUYQ-PATCHSET b/liuyq-patches/LIUYQ-PATCHSET
index 92efad4..cfbf4ae 100755
--- a/host-tools/LIUYQ-PATCHSET
+++ b/liuyq-patches/LIUYQ-PATCHSET
@@ -16,4 +16,3 @@ if ! [ -d "$AOSP" ] && ! [ -d "$AOSP/bionic" ] && [ -d "$AOSP"/build ]; then
 fi
 
 # changes to make chromium_org to use the system libz.so and libz_minizip.so
-apply --linaro device/linaro/build 16439/1
diff --git a/android-tools/liuyq.xml b/liuyq-patches/liuyq.xml
index 8a8d829..46cc546 100644
--- a/android-tools/liuyq.xml
+++ b/liuyq-patches/liuyq.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <!--
   <remote name="linaro-android" fetch="git://android.git.linaro.org/" review="review.android.git.linaro.org" />
   <remote name="github4liuyq" fetch="http://github.com/" />
 
   <project path="packages/apps/AndroidTerm" name="platform/external/AndroidTerm" revision="linaro-master" remote="linaro-android"/>
-  <project path="external/blitVH-test" name="platform/external/blitVH-test" revision="master" remote="linaro-android" />
   <project path="packages/inputmethods/hackerskeyboard" name="liuyq/hackerskeyboard" revision="master" remote="github4liuyq"/>
--->
 <!--
   <project path="external/opencv-upstream" name="Itseez/opencv" revision="master" remote="github4liuyq" />
 -->
-  <!--
+  <project path="external/ncurses" name="platform/external/ncurses" revision="linaro" groups="common" remote="linaro-android"/>
   <project path="external/opencv-upstream" name="liuyq/opencv" revision="master" remote="github4liuyq" />
 
   <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro" />
   <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9-linaro" />
   <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.1-linaro" />
   <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.1-linaro" />
--->
+  <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-5.2-linaro" />
+  <remove-project name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-5.2-linaro" />
+  <!--
+  <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"  />
+  -->
 </manifest>
diff --git a/scripts-common/sync-common.sh b/scripts-common/sync-common.sh
index cd94b62..b2307b7 100755
--- a/scripts-common/sync-common.sh
+++ b/scripts-common/sync-common.sh
@@ -79,7 +79,10 @@ sync_linaro(){
 
     cd ${BASE}
 
-    cp -uvf android-tools/liuyq.xml .repo/local_manifests/liuyq.xml
+    cp -uvf liuyq-patches/liuyq.xml .repo/local_manifests/liuyq.xml
+    if [ -d android-patchsets ]; then
+        cp -uvf liuyq-patches/LIUYQ-PATCHSET android-patchsets/liuyq.xml
+    fi
     juno_mali_binary
     hikey_mali_binary
 }
diff --git a/sync-marshmallow-local-private.sh b/sync-marshmallow-local-private.sh
index 02b742b..9450048 100755
--- a/sync-marshmallow-local-private.sh
+++ b/sync-marshmallow-local-private.sh
@@ -25,8 +25,7 @@ ${BASE}/sync-projects.sh  build \
 ./android-patchsets/marshmallow-gcc5-patchset
 
 #./android-patchsets/nexus9-workarounds
-cp host-tools/LOLLIPOP-LIUYQ-PATCHSET ./android-patchsets/LOLLIPOP-LIUYQ-PATCHSET
-./android-patchsets/LOLLIPOP-LIUYQ-PATCHSET
+./android-patchsets/LIUYQ-PATCHSET
 
-#./build.sh
+./build.sh
 exit