diff --git a/.gitignore b/.gitignore
index 9b059f078afe14b91c98627b0ca5e66fcee69549..a6f5a22c0abb7716d310e4dd1bace57730c37413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ third_party/d8*
 third_party/icu*
 third_party/libdex*
 third_party/aosp_10.0.0_r35*
+third_party/aosp_modified*
 tools/android*
 tools/aosp*
 tools/clang*
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index adfa3a5ced63ada461707f2127c96e1699d35286..5daacf85615b43f97c7d16c7fbb7bcf50187afe3 100755
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -29,7 +29,7 @@ declare_args() {
 # Define global args
 MAPLE_ROOT = getenv("MAPLE_ROOT")
 ANDROID_ROOT = "${MAPLE_ROOT}/android"
-AOSP_ROOT = "${MAPLE_ROOT}/third_party/aosp_10.0.0_r35"
+AOSP_ROOT = "${MAPLE_ROOT}/third_party/aosp_modified"
 MAPLE_BUILD_TYPE = getenv("MAPLE_BUILD_TYPE")
 MAPLE_BUILD_OUTPUT = getenv("MAPLE_BUILD_OUTPUT")
 OLD_OS = getenv("OLD_OS")
diff --git a/build/third_party/patch.sh b/build/third_party/patch.sh
index 39cd85dd632c70e219da4adad46188a83f99e368..9282409e74f46acbd6ba32eb84db4452738bb616 100644
--- a/build/third_party/patch.sh
+++ b/build/third_party/patch.sh
@@ -17,11 +17,12 @@
 THIRD_PARTY_PATH=$MAPLE_ROOT/third_party
 TOOLS_PATH=$MAPLE_ROOT/build/third_party
 AOSP_PATH=$THIRD_PARTY_PATH/aosp_10.0.0_r35
-TEMP_PATH=$THIRD_PARTY_PATH/temp
 AOSP_GN_PATH=$TOOLS_PATH/aosp_gn
+TEMP_PATH=$THIRD_PARTY_PATH/temp
+MODIFIED_AOSP_PATH=$THIRD_PARTY_PATH/aosp_modified
 
 function install_patch {
-    if [ -d $TEMP_PATH ];then
+    if [ -d $MODIFIED_AOSP_PATH ];then
         echo "Already Patched."
         exit 0
     fi
@@ -30,9 +31,7 @@ function install_patch {
 
     #backup source code
     cd $THIRD_PARTY_PATH
-    mkdir -p $TEMP_PATH
-    tar -zcf aosp_10.0.0_r35.tar.gz aosp_10.0.0_r35/
-    mv aosp_10.0.0_r35.tar.gz $TEMP_PATH/
+    cp -r aosp_10.0.0_r35 temp
 
     #patch
     cd $AOSP_PATH
@@ -46,20 +45,19 @@ function install_patch {
     cp $AOSP_GN_PATH/system/core/libziparchive/BUILD.gn $AOSP_PATH/system/core/libziparchive/
     cp $AOSP_GN_PATH/system/core/base/BUILD.gn $AOSP_PATH/system/core/base/
 
+    #recover source directory
+    cd $THIRD_PARTY_PATH
+    mv aosp_10.0.0_r35 aosp_modified
+    mv temp aosp_10.0.0_r35
 }
 
 
 function uninstall_patch {
-    if [ ! -d $TEMP_PATH ];then
+    if [ ! -d $MODIFIED_AOSP_PATH ];then
         exit 0
     fi
 
-    cd $THIRD_PARTY_PATH
-    rm -rf $AOSP_PATH
-    mv $TEMP_PATH/aosp_10.0.0_r35.tar.gz .
-    tar -zxvf aosp_10.0.0_r35.tar.gz > 0
-    rm -rf $TEMP_PATH
-    rm -rf aosp_10.0.0_r35.tar.gz
+    rm -rf $MODIFIED_AOSP_PATH $TEMP_PATH
 }
 
 function main {