Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b39ad7c9 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

AAPT2: Add -A (assets) support 

Looks like the build system doesn't support assets/ for
resources, so we will re-introduce them in aapt2, even though
we're just copying them around and they would be better
suited for inclusion in the APK when classes.dex gets inserted.

Bug: 35461578
Test: CTS test android.content.res.cts.AssetManager#testAssetOperations should pass
Change-Id: I18361d7367d476806bcf7154ee76df3f0e83b565
parent 208e2644

tools/aapt2/integration-tests/AppOne/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ LOCAL_USE_AAPT2 := true 
LOCAL_PACKAGE_NAME := AaptTestAppOne

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := $(call all-java-files-under,src)

LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets $(LOCAL_PATH)/assets2

LOCAL_STATIC_ANDROID_LIBRARIES := \

    AaptTestStaticLibOne \

    AaptTestStaticLibTwo

tools/aapt2/integration-tests/AppOne/assets/subdir/subsubdir/test.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
subdir/subsubdir/test.txt comes from assets

tools/aapt2/integration-tests/AppOne/assets/test.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
test.txt came from assets

tools/aapt2/integration-tests/AppOne/assets2/new.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
new.txt came from assets2

tools/aapt2/integration-tests/AppOne/assets2/test.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
test.txt came from assets2