redundancy: remove unspecial special cases (#3755)

As we discussed before, some of the dirs in RAW_DIRNAMES are treated
as standard dirs in an APK, despite not being such.

Instead of arbitrarily deciding what is known and what is unknown,
we can make a concrete distinction: known dirs are dirs that are
standard in APKs as generated by aapt: "assets", "lib" and "res".
Everything else is app or library-specific and is unknown to aapt or
smali/baksmali and should be treated as raw files that must be
preserved as-is.

"libs" (not "lib") is another example of a non-standard dir that might
appear in specific APKs simply because the developers decided so, but
it's not used for native libraries when calling loadLibrary.
https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/core/java/android/app/LoadedApk.java;l=565

Thanks to refactoring done some months ago, everything in "unknown" is
already being preserved when rebuilding an APK, no special considerations
needed for kotlin.

Author: IgorEisberg

brut.apktool/apktool-lib/src/main/java/brut/androlib/AaptInvoker.java

@@ -158,7 +158,6 @@ private void invokeAapt2(File apkFile, File manifest, File resDir, File rawDir,
         cmd.add("--no-version-vectors");
         cmd.add("--no-version-transitions");
         cmd.add("--no-resource-deduping");
-
         cmd.add("--no-compile-sdk-metadata");
 
         // #3427 - Ignore stricter parsing during aapt2

brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java

@@ -29,7 +29,7 @@
 
 public class ApkInfo implements YamlSerializable {
     public static final String[] RESOURCES_DIRNAMES = { "res", "r", "R" };
-    public static final String[] RAW_DIRNAMES = { "assets", "lib", "libs", "kotlin", "META-INF/services" };
+    public static final String[] RAW_DIRNAMES = { "assets", "lib" };
 
     public static final Pattern ORIGINAL_FILENAMES_PATTERN = Pattern.compile(
         "AndroidManifest\\.xml|META-INF/[^/]+\\.(RSA|SF|MF)|stamp-cert-sha256");

brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java

@@ -810,7 +810,6 @@ private void doNext() throws IOException {
                 continue;
             }
 
-
             if (chunkType == ARSCHeader.RES_XML_START_ELEMENT_TYPE) {
                 mNamespaceIndex = mIn.readInt();
                 mNameIndex = mIn.readInt();

brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt1/BuildAndDecodeTest.java

@@ -536,7 +536,6 @@ public void resRawTest() throws BrutException {
 
     @Test
     public void libsTest() throws BrutException {
-        compareBinaryFolder("libs");
         compareBinaryFolder("lib");
     }
 
@@ -569,9 +568,4 @@ public void singleDexTest() throws BrutException {
         compareBinaryFolder("smali");
         assertTrue(new File(sTestOrigDir, "build/apk/classes.dex").isFile());
     }
-
-    @Test
-    public void confirmKotlinFolderPersistsTest() {
-        assertTrue(new File(sTestNewDir, "kotlin").isDirectory());
-    }
 }

brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinCoroutinesTest.java

@@ -235,8 +235,8 @@ protected Map<String, AbstractDirectory> getAbstractDirs(boolean recursive) {
         return dirs;
     }
 
-
     public void close() throws IOException {
+        // stub
     }
 
     private SubPath getSubPath(String path) throws PathNotExist {

brut.apktool/apktool-lib/src/test/java/brut/androlib/decode/DecodeKotlinTest.java

@@ -167,7 +167,6 @@ private ZipFile getZipFile() {
         return mZipFile;
     }
 
-
     public void close() throws IOException {
         mZipFile.close();
     }