fix: zip entry name

[xtulnx]

In a unity3d game, if there is a resource directory assets/AssetBundles/Assets, for example

assets
├── AssetBundles
│   ├── Assets
│   │   └── a.txt
│   └── b.json

would result in an entry Assets/AssetBundles/b.json in the apk:

$ unzip -l demo.apk | grep -i assets/AssetBundles
         0 04-07-2023 23:03 assets/AssetBundles/Assets/a.txt
         0 04-07-2023 23:10 Assets/AssetBundles/b.json

[jiashie]

same issue here!!!

[iBotPeaches]

Could we add a test for this? Not following the change and to be sure it doesn't regress - I think we should adapt test apk for both aapt1 and aapt2.

[iBotPeaches]

@xtulnx - I wrote a test for this and its not failing without this patch. Am I properly following in this PR? #3074

[xtulnx]

test-apktool.zip

@iBotPeaches Hi, Here is the demo:

On macOS 13.3.1

Open the Android project, compile and run the application.

view apk:

$  unzip -l ./app/build/outputs/apk/debug/app-debug.apk|grep -i "assets"
       10  01-01-1981 01:01   assets/a.txt
        9  01-01-1981 01:01   assets/AssetBundles/Assets/d.txt
       10  01-01-1981 01:01   assets/AssetBundles/c.txt
       10  01-01-1981 01:01   assets/Assets/b.txt

unpack

$ java -jar ~/tools/apktools/apktool_2.6.0.jar d ./app/build/outputs/apk/debug/app-debug.apk -f -r -s -o tmp

I: Using Apktool 2.6.0 on app-debug.apk
I: Copying raw resources...
I: Copying raw classes.dex file...
I: Copying raw classes2.dex file...
I: Copying assets and libs...
I: Copying unknown files...
I: Copying original files..

pack

$  java -jar ~/tools/apktools/apktool_2.6.0.jar b tmp

check

$  unzip -l tmp/dist/app-debug.apk | grep -i assets
       10  05-23-2023 11:11   Assets/a.txt
       10  05-23-2023 11:11   Assets/AssetBundles/c.txt
        9  05-23-2023 11:11   assets/AssetBundles/Assets/d.txt
       10  05-23-2023 11:11   assets/Assets/b.txt

Now, miss assets/a.txt and assets/AssetBundles/c.txt , the path has changed.

[iBotPeaches]

Couldn't replicate this :/

So closing.

➜  3038 unzip -l app-debug.apk| grep -i "assets"
       10  1981-01-01 01:01   assets/a.txt
        9  1981-01-01 01:01   assets/AssetBundles/Assets/d.txt
       10  1981-01-01 01:01   assets/AssetBundles/c.txt
       10  1981-01-01 01:01   assets/Assets/b.txt
➜  3038 apktool d app-debug.apk -f -r -s -o tmp
I: Using Apktool 2.7.1-7a22af-SNAPSHOT on app-debug.apk
I: Copying raw manifest...
I: Copying raw resources...
I: Copying raw classes.dex file...
I: Copying raw classes2.dex file...
I: Copying assets and libs...
I: Copying unknown files...
I: Copying original files...
➜  3038 apktool b tmp 
I: Using Apktool 2.7.1-7a22af-SNAPSHOT
I: Copying tmp classes.dex file...
I: Copying tmp classes2.dex file...
I: Checking whether resources has changed...
I: Copying raw resources...
I: Building apk file...
I: Copying unknown files/dir...
I: Built apk into: tmp/dist/app-debug.apk
➜  3038 unzip -l tmp/dist/app-debug.apk| grep 'assets'
       10  2023-07-04 12:31   assets/Assets/b.txt
        9  2023-07-04 12:31   assets/AssetBundles/Assets/d.txt
       10  2023-07-04 12:31   assets/AssetBundles/c.txt
       10  2023-07-04 12:31   assets/a.txt
➜  3038 

Sorry for delay.

[stray-coding]

@iBotPeaches You should use a Windows device to reproduce，not Mac device
assets will be rename Assets!!!

You can use jadx or 7z to view the wrong assets directory