some updates

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

10 files changed, 120 insertions, 17 deletions

diff --git a/android-cts/linaro.readme b/android-cts/linaro.readme
index 5edf0dc..ef0ecb7 100644
--- a/android-cts/linaro.readme
+++ b/android-cts/linaro.readme
@@ -25,3 +25,5 @@
     }
 4. scp hackbox://home/yongqin.liu/android-tools/out/build/base/ddmlib/build/classes/main/com/android/ddmlib/AdbHelper*.class com/android/ddmlib/
 5. jar -uvf tradefed-prebuilt.jar com/
+
+https://android.googlesource.com/platform/cts/+/d8972ff/tools/tradefed-host/src/com/android/cts/tradefed/targetprep/HostPreconditionPreparer.java
diff --git a/android-tools/Android.mk b/android-tools/Android.mk
index 4f13769..118d628 100644
--- a/android-tools/Android.mk
+++ b/android-tools/Android.mk
@@ -1,5 +1,6 @@
-LOCAL_PATH := $(call my-dir)
+TOP_PATH := $(call my-dir)
 
+LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := adbovertcpip.sh
 LOCAL_MODULE_CLASS := EXECUTABLES
@@ -16,6 +17,6 @@ LOCAL_SRC_FILES := adbroot.sh
 LOCAL_MODULE_TAGS := debug
 include $(BUILD_PREBUILT)
 
--include $(LOCAL_PATH)/sl/Android.mk
--include $(LOCAL_PATH)/static-binary/src/Android.mk
--include $(LOCAL_PATH)/apks/Android.mk
+-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/android-links.txt b/android-tools/android-links.txt
index 8a45523..2f5d9cf 100644
--- a/android-tools/android-links.txt
+++ b/android-tools/android-links.txt
@@ -16,3 +16,7 @@ android-developers.blogspot.com/2009/02/track-memory-allocations.html
 https://source.android.com/devices/tech/debug/index.html "Debugging Native Android Platform Code" 
 https://source.android.com/devices/tech/debug/procstats.html
 https://source.android.com/devices/tech/debug/native-memory.html
+https://source.android.com/devices/tech/config/kernel.html
+https://source.android.com/devices/tech/config/low-ram.html
+
+https://developer.android.com/training/index.html
diff --git a/host-tools/refactory_system_img.sh b/host-tools/refactory_system_img.sh
index fac9063..dd70b20 100755
--- a/host-tools/refactory_system_img.sh
+++ b/host-tools/refactory_system_img.sh
@@ -28,7 +28,8 @@ f_system_img_new="${cur_dir}/system_new.img"
 d_system="${cur_dir}/system"
 f_raw_img="${cur_dir}/raw.img"
 d_raw="${cur_dir}/raw"
-system_size="685768704"
+system_size="685768704" #Nexus10
+system_size="880803840" #Nexus7
 
 function extract_file_contexts(){
     perl "${f_unpack_pl}" "${f_boot_img}"
diff --git a/liuyq-patches/0001-update-to-use-the-heap-configurations-for-1024MB-dev.patch b/liuyq-patches/0001-update-to-use-the-heap-configurations-for-1024MB-dev.patch
new file mode 100644
index 0000000..bce8f6d
--- /dev/null
+++ b/liuyq-patches/0001-update-to-use-the-heap-configurations-for-1024MB-dev.patch
@@ -0,0 +1,28 @@
+From c7fdb76b9b4a9401a59cd528e589542fcfdd9291 Mon Sep 17 00:00:00 2001
+From: Yongqin Liu <yongqin.liu@linaro.org>
+Date: Tue, 12 Jan 2016 02:39:58 +0800
+Subject: [PATCH 1/1] update to use the heap configurations for 1024MB devices
+
+since we have hikey version which only have 1024MB ram
+
+Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
+---
+ device.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/device.mk b/device.mk
+index d84e596..6a14d80 100644
+--- a/device.mk
++++ b/device.mk
+@@ -15,7 +15,7 @@
+ #
+ 
+ # Adjust the dalvik heap to be appropriate for a tablet.
+-$(call inherit-product-if-exists, frameworks/native/build/tablet-10in-xhdpi-2048-dalvik-heap.mk)
++$(call inherit-product-if-exists, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap.mk)
+ 
+ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
+ 			$(LOCAL_PATH)/fstab.hikey:root/fstab.hikey \
+-- 
+1.9.1
+
diff --git a/liuyq-patches/liuyq.xml b/liuyq-patches/liuyq.xml
index e06cc34..eac87f8 100644
--- a/liuyq-patches/liuyq.xml
+++ b/liuyq-patches/liuyq.xml
@@ -1,7 +1,8 @@
 <?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/" />
+  <remote name="linaro-android" fetch="git://android-git.linaro.org/" review="android-review.linaro.org" />
+  <remote name="github4liuyq" fetch="https://github.com/" />
+  <remote name="local" fetch="file:////SATA3/aosp-mirror/hikey/" />
 
   <project path="packages/apps/AndroidTerm" name="platform/external/AndroidTerm" revision="linaro-master" remote="linaro-android"/>
   <project path="packages/inputmethods/hackerskeyboard" name="liuyq/hackerskeyboard" revision="master" remote="github4liuyq"/>
@@ -10,6 +11,9 @@
   <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" />
+  <!--
+  https://code.videolan.org/videolan/vlc-android.git
+  -->
   <project path="android-tools/apks" name="liuyq/apks" revision="master" remote="github4liuyq" />
 
   <remove-project name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9-linaro" />
@@ -22,4 +26,7 @@
   <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/liuyq-patches/nexus9.patch b/liuyq-patches/nexus9.patch
new file mode 100644
index 0000000..a2637fa
--- /dev/null
+++ b/liuyq-patches/nexus9.patch
@@ -0,0 +1,58 @@
+diff --git a/BoardConfig.mk b/BoardConfig.mk
+index 1d17f66..f3ba211 100644
+--- a/BoardConfig.mk
++++ b/BoardConfig.mk
+@@ -51,7 +51,7 @@ TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
+ 
+ TARGET_USERIMAGES_USE_EXT4 := true
+ BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2782920704
+-# BOARD_USERDATAIMAGE_PARTITION_SIZE := 13287555072
++BOARD_USERDATAIMAGE_PARTITION_SIZE := 11865686016
+ BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
+ BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
+ BOARD_FLASH_BLOCK_SIZE := 4096
+@@ -91,6 +91,8 @@ WIFI_DRIVER_FW_PATH_STA     := "/vendor/firmware/fw_bcmdhd.bin"
+ WIFI_DRIVER_FW_PATH_AP      := "/vendor/firmware/fw_bcmdhd_apsta.bin"
+ 
+ BOARD_SEPOLICY_DIRS += device/htc/flounder/sepolicy
++BOARD_SEPOLICY_UNION += \
++        shell.te \
+ 
+ TARGET_USES_64_BIT_BCMDHD := true
+ TARGET_USES_64_BIT_BINDER := true
+diff --git a/device.mk b/device.mk
+index 5511410..da1a245 100644
+--- a/device.mk
++++ b/device.mk
+@@ -30,13 +30,13 @@ else
+ LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
+ endif
+ 
+-BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
++#BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
+ 
+ # This ensures the needed build tools are available.
+ # TODO: make non-linux builds happy with external/f2fs-tool; system/extras/f2fs_utils
+-ifeq ($(HOST_OS),linux)
+-TARGET_USERIMAGES_USE_F2FS := true
+-endif
++#ifeq ($(HOST_OS),linux)
++#TARGET_USERIMAGES_USE_F2FS := true
++#endif
+ 
+ LOCAL_FSTAB := $(LOCAL_PATH)/fstab.flounder
+ 
+@@ -284,3 +284,6 @@ $(call inherit-product-if-exists, vendor/htc/flounder/audio/tfa/device-vendor-tf
+ # Add dependency of the proprietary keystore.flounder module.
+ PRODUCT_PACKAGES += \
+     libkeymaster_messages
++
++##### following are changes by Linaro
++$(call inherit-product-if-exists, device/linaro/build/common-device.mk)
+diff --git a/sepolicy/shell.te b/sepolicy/shell.te
+new file mode 100644
+index 0000000..64e1511
+--- /dev/null
++++ b/sepolicy/shell.te
+@@ -0,0 +1 @@
++allow shell su_exec:file x_file_perms;
diff --git a/scripts-common/sync-common.sh b/scripts-common/sync-common.sh
index 5f442f3..cfbc0ab 100755
--- a/scripts-common/sync-common.sh
+++ b/scripts-common/sync-common.sh
@@ -94,16 +94,16 @@ juno_mali_binary(){
         return
     fi
     curl --fail --show-error -b license_accepted_51722ba4ccc270bcd54cb360cb242798=yes http://snapshots.linaro.org/android/binaries/arm/20151111-members-only/vendor.tar.bz2 >${b_name}
-    tar jxvf ${b_name}
+    tar xavf ${b_name}
 }
 
 hikey_mali_binary(){
-    local b_name="hikey-20150623-vendor.tar.bz2"
+    local b_name="hikey-20160113-vendor.tar.bz2"
     if [ -f ./${b_name} ]; then
         return
     fi
-    curl --fail --show-error -b license_accepted_eee6ac0e05136eb58db516d8c9c80d6b=yes http://snapshots.linaro.org/android/binaries/hikey/20150623-members-only/vendor.tar.bz2 >${b_name}
-    tar jxvf ${b_name}
+    curl --fail --show-error -b license_accepted_eee6ac0e05136eb58db516d8c9c80d6b=yes http://snapshots.linaro.org/android/binaries/hikey/20160113/vendor.tar.bz2 >${b_name}
+    tar xavf ${b_name}
 }
 
 main(){
diff --git a/sync-marshmallow-linaro.sh b/sync-marshmallow-linaro.sh
index dad5341..f11fde6 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.1_r10"
+branch="android-6.0.1_r16"
 
 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 5618943..c637bab 100755
--- a/sync-marshmallow-local-private.sh
+++ b/sync-marshmallow-local-private.sh
@@ -4,7 +4,8 @@ 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.1_r10"
+#branch="android-6.0.0_r26"
+branch="android-6.0.1_r16"
 
 LOCAL_MANIFEST="ssh://git@dev-private-git.linaro.org/linaro-art/platform/manifest.git"
 LOCAL_MANIFEST_BRANCH="linaro-marshmallow"
@@ -13,14 +14,15 @@ main "$@"
 
 ${BASE}/sync-projects.sh  build \
                           bionic \
-                          art \
                           android-patchsets \
                           device/linaro/hikey \
 
+#                          kernel/linaro/hisilicon/ \
+#                          art \
 #                          external/opencv-upstream \
 
-export http_proxy=127.0.0.1:8087
-export https_proxy=127.0.0.1:8087
+#export http_proxy=192.168.0.102:37586
+#export https_proxy=192.168.0.102:37586
 ./android-patchsets/MARSHMALLOW-MLCR-PATCHSET
 if [ $? -ne 0 ]; then
     echo "Failed to run MARSHMALLOW-MLCR-PATCHSET"
@@ -49,5 +51,5 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-./build.sh
+#./build.sh
 exit