From ecb22c9a8f80942ef5690801917fa8dd9acc4a23 Mon Sep 17 00:00:00 2001
From: nian0114 <268078545@qq.com>
Date: Sat, 9 Dec 2017 12:54:43 -0500
Subject: [PATCH 1/2] fix null with the mount_point

---
 tools/target_files_from_device.sh | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/tools/target_files_from_device.sh b/tools/target_files_from_device.sh
index 48cd74d..80ab12b 100755
--- a/tools/target_files_from_device.sh
+++ b/tools/target_files_from_device.sh
@@ -152,14 +152,11 @@ function updateSystemPartitionSize {
             slot_suffix="_a"
         fi
     fi
-    if [ "$ROOT_STATE" = "system_root" ]; then
-        SYSTEM_MOUNT_POINT=$(adb shell su -c find /dev/block/ -name system$slot_suffix)
-        SYSTEM_SOFT_MOUNT_POINT=$(adb shell su -c ls -l $SYSTEM_MOUNT_POINT | awk -F '->' '{print $2}' | awk -F '/' '{print $NF}')
-    else
+   
         waitForDeviceOnline
-        SYSTEM_MOUNT_POINT=$(adb shell find /dev/block/ -name "system"$slot_suffix)
+        SYSTEM_MOUNT_POINT=$(adb shell mount | grep "system" | awk '{print $1}')
         SYSTEM_SOFT_MOUNT_POINT=$(adb shell ls -l $SYSTEM_MOUNT_POINT | awk -F '->' '{print $2}' | awk -F '/' '{print $NF}')
-    fi
+
     SYSTEM_PARTITION_SIZE=$(adb shell cat proc/partitions | grep $SYSTEM_SOFT_MOUNT_POINT | awk 'BEGIN{FS=" "}{print $3}')
     if [ x"$SYSTEM_PARTITION_SIZE" = x ] || [ -z "$(echo $SYSTEM_PARTITION_SIZE | sed -n "/^[0-9]\+$/p")" ]; then
         echo "system partition size get error!"
@@ -218,11 +215,9 @@ function buildSystemInfo {
 function buildSystemDir_dd {
     echo ">> dd system from device (time-costly, be patient) ..."
     waitForDeviceOnline
-    if [ "$ROOT_STATE" = "system_root" ];then
-        adb shell su -c dd if=$SYSTEM_MOUNT_POINT of=/sdcard/system.img bs=2048 > /dev/null 2>&1
-    else
-        adb shell dd if=$SYSTEM_MOUNT_POINT of=/sdcard/system.img bs=2048 > /dev/null 2>&1
-    fi
+    
+    adb shell dd if=$SYSTEM_MOUNT_POINT of=/sdcard/system.img bs=2048> /dev/null 2>&1
+    
     adb pull /sdcard/system.img $OUT_DIR/system.img  > /dev/null 2>&1
     adb shell rm /sdcard/system.img
     unpack_systemimg $OUT_DIR/system.img $SYSTEM_DIR

From cd2b9787f4ac3e634ff4d5b14849aa60ea490fed Mon Sep 17 00:00:00 2001
From: nian0114 <268078545@qq.com>
Date: Sat, 9 Dec 2017 12:56:33 -0500
Subject: [PATCH 2/2] use speical apktool to auto merge classes

---
 defines.mk | 4 ++--
 locals.mk  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/defines.mk b/defines.mk
index 29e7526..2a61142 100644
--- a/defines.mk
+++ b/defines.mk
@@ -451,7 +451,7 @@ $(OUT_OBJ_SYSTEM)/$(2): $(BOARD_SYSTEM)/$(2) $(MERGE_UPDATE_TXT) $(PREPARE_FRW_R
 	$(hide) $(call name_to_id,$$(tempSmaliDir))
 	$(hide) $(call update_apktool_yml,$$(tempSmaliDir)/apktool.yml,$(APKTOOL_BOARD_TAG));
 	$(hide) mkdir -p $(OUT_OBJ_SYSTEM)
-	$(hide) $(APKTOOL) b $$(tempSmaliDir) -p $(APKTOOL_FRAME_PATH_BOARD_MODIFY) -o $$@
+	$(hide) $(APKTOOL_FRAMEWORK) b $$(tempSmaliDir) -p $(APKTOOL_FRAME_PATH_BOARD_MODIFY) -o $$@
 	$(hide) rm -rf "$$(tempSmaliDir)";
 	$(hide) echo "<<< build |target-files|SYSTEM|board_modify_jar| to $$@ done"
 endef
@@ -480,7 +480,7 @@ $(eval board_prebuilt_from:=)
 	$(hide) $(call custom_jar,$$(jarBaseName),$$(tempSmaliDir))
 	$(hide) $(call name_to_id,$$(tempSmaliDir))
 	$(hide) $(call update_apktool_yml,$$(tempSmaliDir)/apktool.yml,$(APKTOOL_MERGED_TAG));
-	$(hide) $(APKTOOL) b $$(tempSmaliDir) -o $$@;
+	$(hide) $(APKTOOL_FRAMEWORK) b $$(tempSmaliDir) -o $$@;
 	$(hide) rm -rf $$(tempSmaliDir);
 	$(hide) rm -rf $$(boardSmaliDir);
 	$(hide) echo "<<< build |target-files|SYSTEM|vendor_modify_jar| to $$@ done";
diff --git a/locals.mk b/locals.mk
index 8aca8c9..4a1b16e 100644
--- a/locals.mk
+++ b/locals.mk
@@ -367,6 +367,7 @@ OTA_CERT := $(PORT_ROOT)/$(CERTS_PATH)/testkey
 ############### tools in $(PORT_ROOT)/tools ###############
 PORT_TOOLS      := $(PORT_ROOT)/tools
 APKTOOL         := $(PORT_TOOLS)/apktool
+APKTOOL_FRAMEWORK := $(PORT_TOOLS)/apktool_framework
 OTA_NORMALIZE	:= $(PORT_TOOLS)/otanormalize
 
 NAME_TO_ID_TOOL := $(PORT_TOOLS)/nametoid