optimize dex opt process, add more failure point check

Author: wwm0609

amigo-lib/.gitignore

@@ -1 +1,2 @@
 /build
+/.externalNativeBuild

amigo-lib/CMakeLists.txt

@@ -0,0 +1,45 @@
+# Sets the minimum version of CMake required to build the native
+# library. You should either keep the default value or only pass a
+# value of 3.4.0 or lower.
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds it for you.
+# Gradle automatically packages shared libraries with your APK.
+
+add_library( # Sets the name of the library.
+             symbolic-link
+
+             # Sets the library as a shared library.
+             SHARED
+
+             # Provides a relative path to your source file(s).
+             # Associated headers in the same location as their source
+             # file are automatically included.
+             src/main/cpp/SymbolicLinkUtil.cpp)
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because system libraries are included in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+find_library( # Sets the name of the path variable.
+              log-lib
+
+              # Specifies the name of the NDK library that
+              # you want CMake to locate.
+              log )
+
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in the
+# build script, prebuilt third-party libraries, or system libraries.
+
+target_link_libraries( # Specifies the target library.
+                       symbolic-link
+
+                       # Links the target library to the log library
+                       # included in the NDK.
+                       $\{log-lib} )

amigo-lib/build.gradle

@@ -12,7 +12,23 @@ android {
         versionCode 1
         versionName "1.0"
         consumerProguardFiles 'proguard-rules.txt'
+        externalNativeBuild {
+            cmake {
+                cppFlags "-std=c++11"
+            }
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            path "CMakeLists.txt"
+        }
+    }
+
+    lintOptions {
+        abortOnError false
     }
+
 }
 
 dependencies {

amigo-lib/src/main/aidl/android/app/IAmigoService.aidl

@@ -0,0 +1,41 @@
+//
+// Created by wwm on 3/10/17.
+//
+
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+#include "SymbolicLinkUtil.h"
+
+jint throwException(JNIEnv *env, const char *message) {
+    jclass exClass;
+    const char *className = "java/io/IOException";
+    exClass = env->FindClass(className);
+
+    if(!exClass) {
+      return -1; // ignore
+    }
+
+    return env->ThrowNew(exClass, message);
+}
+
+
+JNIEXPORT jint JNICALL Java_me_ele_amigo_utils_SymbolicLinkUtil_makeSymbolicLink
+        (JNIEnv *env, jclass clazz, jstring linkPath, jstring targetFilePath) {
+    const char *inputFilePathC = env->GetStringUTFChars(targetFilePath, 0);
+    const char *inputSymLinkPathC = env->GetStringUTFChars(linkPath, 0);
+
+    int result = symlink(inputFilePathC, inputSymLinkPathC);
+
+    //release resources when done
+    env->ReleaseStringUTFChars(targetFilePath, inputFilePathC);
+    env->ReleaseStringUTFChars(linkPath, inputSymLinkPathC);
+
+    if (result == -1) {
+        char errorStr[100];
+        sprintf(errorStr, "failed to create link, errno=%d", errno);
+        throwException(env, errorStr);
+    }
+
+    return result;
+}

amigo-lib/src/main/cpp/SymbolicLinkUtil.cpp

@@ -6,15 +6,12 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.os.Handler;
-import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
-
 import java.io.File;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 import java.util.Map;
-
 import me.ele.amigo.exceptions.LoadPatchApkException;
 import me.ele.amigo.hook.HookFactory;
 import me.ele.amigo.reflect.FieldUtils;
@@ -399,7 +396,7 @@ public static void workLaterWithoutCheckingSignature(Context context, File patch
     }
 
     public interface WorkLaterCallback {
-        void onPatchApkReleased();
+        void onPatchApkReleased(boolean success);
     }
 
     private static void workLater(Context context, File patchFile, boolean checkSignature,

amigo-lib/src/main/cpp/SymbolicLinkUtil.h

@@ -1,6 +1,7 @@
 package me.ele.amigo;
 
 import android.content.Context;
+import android.os.Build;
 import android.util.Log;
 
 import java.io.File;
@@ -11,7 +12,6 @@
 
 import dalvik.system.DexClassLoader;
 
-
 public class AmigoClassLoader extends DexClassLoader {
     private static final String TAG = AmigoClassLoader.class.getName();
 
@@ -38,6 +38,33 @@ public static AmigoClassLoader newInstance(Context context, String checksum) {
                 AmigoClassLoader.class.getClassLoader().getParent());
     }
 
+    private static String getLibraryPath(Context context, String checksum) {
+        return AmigoDirs.getInstance(context).libDir(checksum).getAbsolutePath();
+    }
+
+    private static String joinPath(File folder) {
+        StringBuilder path = new StringBuilder();
+        File[] libFiles = folder.listFiles();
+        if (libFiles == null || libFiles.length == 0) {
+            return null;
+        }
+
+        for (File libFile : libFiles) {
+            path.append(File.pathSeparatorChar);
+            path.append(libFile.getAbsolutePath());
+        }
+        return path.toString();
+    }
+
+    private static String getDexPath(Context context, String checksum) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            return PatchApks.getInstance(context).patchPath(checksum);
+        }
+
+        String dexPath = joinPath(AmigoDirs.getInstance(context).dexDir(checksum));
+        return dexPath != null ? dexPath : PatchApks.getInstance(context).patchPath(checksum);
+    }
+
     @Override
     protected URL findResource(String name) {
         if ((zipFile == null) || (zipFile.getEntry(name) == null)) {
@@ -71,32 +98,4 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
             return AmigoClassLoader.class.getClassLoader().loadClass(name);
         }
     }
-
-    private static String getLibraryPath(Context context, String checksum) {
-        return AmigoDirs.getInstance(context).libDir(checksum).getAbsolutePath();
-    }
-
-    private static String joinPath(File folder) {
-        StringBuilder path = new StringBuilder();
-        File[] libFiles = folder.listFiles();
-        if (libFiles == null || libFiles.length == 0) {
-            return null;
-        }
-
-        for (File libFile : libFiles) {
-            path.append(File.pathSeparatorChar);
-            path.append(libFile.getAbsolutePath());
-        }
-        return path.toString();
-    }
-
-    private static String getDexPath(Context context, String checksum) {
-        String dexPath = joinPath(AmigoDirs.getInstance(context).dexDir(checksum));
-        if (dexPath == null) {
-            throw new RuntimeException("Amigo: no patch dex available for checksum[" + checksum +
-                    "]");
-        }
-        return dexPath;
-    }
-
 }

amigo-lib/src/main/java/me/ele/amigo/Amigo.java

@@ -2,14 +2,11 @@
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.os.Build;
 import android.util.Log;
-
 import java.io.File;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-
-import me.ele.amigo.reflect.FieldUtils;
 import me.ele.amigo.utils.CommonUtils;
 import me.ele.amigo.utils.FileUtils;
 
@@ -141,7 +138,29 @@ private void ensurePatchDirs(String checksum) {
 
     public boolean isOptedDexExists(String checksum) {
         File[] odexes = dexOptDir(checksum).listFiles();
-        return odexes != null && odexes.length > 0;
+        int odexFilesLength;
+        if (odexes == null
+                || (odexFilesLength = odexes.length) == 0) {
+            return false;
+        }
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            return odexFilesLength == 1 && odexes[0].exists();
+        }
+
+        File[] dexFiles = dexDir(checksum).listFiles();
+        int dexFilesLength;
+        if (dexFiles == null || (dexFilesLength = dexFiles.length) != odexFilesLength) {
+            return false;
+        }
+
+        for (int i = 0; i < dexFilesLength; i++) {
+            if (!dexFiles[i].exists() || !odexes[i].exists()) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     // delete dex, odex, so files of a patch and also clear unused patches
@@ -170,6 +189,7 @@ private void clearAmigoDir(File excludeFile) {
             return;
         }
 
+        //always keep amigo.json
         File patchInfoFile = patchInfoFile();
         for (File subFile : subFiles) {
             if (!subFile.equals(patchInfoFile) && !subFile.equals(excludeFile)) {