update

python/tools/garbel/package_garble.py

@@ -11,9 +11,9 @@ class PackageGarble:
     # 随机串(全小写加下划线，避免和activity混淆重复)
     def __gen_rand_str(self):
         random_str1 = ''.join(random.sample(
-            "abcdefghijklmnopqrstuvwxyz", random.randint(4, 8)))
+            "abcdefghijklmnopqrstuvwxyz", random.randint(3, 6)))
         random_str2 = ''.join(random.sample(
-            "abcdefghijklmnopqrstuvwxyz", random.randint(4, 8)))
+            "abcdefghijklmnopqrstuvwxyz", random.randint(3, 6)))
         return "%s_%s"%(random_str1,random_str2)
 
     # 替换文件内容
@@ -73,6 +73,7 @@ class PackageGarble:
 
     #重命名所有包路径
     def __rename_pkg(self,path):
+        mapping = {}
         for root, dirs, files in os.walk(path):
             if "main/java" in root:
                 root += "/"
@@ -85,10 +86,12 @@ class PackageGarble:
                             dir_name = value.split(".")[index]
                             old_name = os.path.join(os.path.join(os.getcwd(), root), dir)
                             new_name = os.path.join(os.path.join(os.getcwd(), root),dir_name )
-                            os.rename(old_name, new_name)
+                            mapping[old_name] = new_name
                             print ("rename %s -> %s"%(dir,dir_name))
                             break
                         
+        for (old,new) in mapping.items:
+                os.rename(old, new)
 
     def __process_files(self, path):
         for root, dirs, files in os.walk(path):