Release 0.1.7 version, support resource file keep rule

bytedance · Aug 12, 2020 · f980868 · f980868
1 parent 762a2ec
commit f980868
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 18 deletions.
diff --git a/core/src/main/java/com/bytedance/android/aabresguard/executors/ResourcesObfuscator.java b/core/src/main/java/com/bytedance/android/aabresguard/executors/ResourcesObfuscator.java
@@ -226,13 +226,20 @@ private Map<String, String> obfuscateModuleEntries(BundleModule bundleModule, Ma
                     String bundleRawPath = bundleModule.getName().getName() + "/" + entry.getPath().toString();
                     String bundleObfuscatedPath = resourcesMapping.getEntryFilesMapping().get(bundleRawPath);
                     if (bundleObfuscatedPath == null) {
-                        String fileSuffix = FileOperation.getFileSuffix(entry.getPath());
-                        String obfuscatedName = guardStringBuilder.getReplaceString(mapping);
-                        mapping.add(obfuscatedName);
-                        bundleObfuscatedPath = obfuscateDir + "/" + obfuscatedName + fileSuffix;
-                        resourcesMapping.putEntryFileMapping(bundleRawPath, bundleObfuscatedPath);
+                        if (!shouldBeObfuscated(bundleRawPath)) {
+                            System.out.println(String.format(
+                                    "[whiteList] find whiteList resource file, resource: %s",
+                                    bundleRawPath
+                            ));
+                            return;
+                        } else {
+                            String fileSuffix = FileOperation.getFileSuffix(entry.getPath());
+                            String obfuscatedName = guardStringBuilder.getReplaceString(mapping);
+                            mapping.add(obfuscatedName);
+                            bundleObfuscatedPath = obfuscateDir + "/" + obfuscatedName + fileSuffix;
+                            resourcesMapping.putEntryFileMapping(bundleRawPath, bundleObfuscatedPath);
+                        }
                     }
-
                     if (obfuscateEntries.values().contains(bundleObfuscatedPath)) {
                         throw new IllegalArgumentException(
                                 String.format("Multiple entries with same key: %s -> %s",

diff --git a/core/src/main/java/com/bytedance/android/aabresguard/utils/FileOperation.java b/core/src/main/java/com/bytedance/android/aabresguard/utils/FileOperation.java
@@ -169,12 +169,7 @@ public static void copyFileUsingStream(File source, File dest) throws IOExceptio
     }
 
     public static String getFileSimpleName(ZipPath zipPath) {
-        String fileName = zipPath.getName(zipPath.getNameCount() - 1).toString();
-        if (!fileName.contains(".")) {
-            return fileName;
-        }
-        String[] values = fileName.split(".");
-        return values[0];
+        return zipPath.getFileName().toString();
     }
 
     public static String getFileSuffix(ZipPath zipPath) {

diff --git a/gradle/aabresguard.gradle b/gradle/aabresguard.gradle
@@ -4,14 +4,20 @@ if (!"true".equalsIgnoreCase(System.getProperty("enableAabResGuardPlugin", "fals
 
 apply plugin: "com.bytedance.android.aabResGuard"
 aabResGuard {
-    enableObfuscate = false
-//    mappingFile = file("../mapping.txt").toPath()
+    enableObfuscate = true
+    mappingFile = file("../mapping.txt").toPath()
     whiteList = [
+            // keep resources
             "*.R.raw.*",
-            "*.R.drawable.icon"
+            "*.R.drawable.icon",
+            "*.R.drawable.ic_*",
+            "*.R.anim.abc*",
+            "*.R.xml.actions",
+            // keep resource file
+            "*/res/xml/actions.xml",
     ]
-    obfuscatedBundleFileName = "duplicated-app.aab"
-    mergeDuplicatedRes = true
+    obfuscatedBundleFileName = "obfuscated-app.aab"
+    mergeDuplicatedRes = false
     enableFilterFiles = true
     filterList = [
             "*/arm64-v8a/*"

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -2,7 +2,7 @@ def versions = [:]
 versions.agp = "3.5.0"
 versions.kotlin = "1.3.61"
 versions.java = "8"
-versions.aabresguard = "0.1.6"
+versions.aabresguard = "0.1.7"
 // android
 versions.compileSdkVersion = 28
 versions.minSdkVersion = 15

diff --git a/samples/app/src/main/res/drawable/ic_abc.png b/samples/app/src/main/res/drawable/ic_abc.png
diff --git a/samples/app/src/main/res/drawable/ic_bcd.png b/samples/app/src/main/res/drawable/ic_bcd.png
diff --git a/samples/app/src/main/res/drawable/ic_keep.png b/samples/app/src/main/res/drawable/ic_keep.png
diff --git a/samples/app/src/main/res/xml/actions.xml b/samples/app/src/main/res/xml/actions.xml
@@ -0,0 +1 @@
+<action></action>