diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-03-13 11:40:48 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-03-14 12:26:28 -0700 |
| commit | b39ad7c9f66877f92ea8583aa8b7b5a8daa6031e (patch) | |
| tree | 8b444f19230497d8a12e940c2ecd7a6673386345 /tools/aapt2/integration-tests | |
| parent | 208e2644618af7474f399089c264f0da1cfb0c81 (diff) | |
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
Diffstat (limited to 'tools/aapt2/integration-tests')
5 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt2/integration-tests/AppOne/Android.mk b/tools/aapt2/integration-tests/AppOne/Android.mk index a6f32d4b9fdc..38bd5b5e3275 100644 --- a/tools/aapt2/integration-tests/AppOne/Android.mk +++ b/tools/aapt2/integration-tests/AppOne/Android.mk @@ -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 diff --git a/tools/aapt2/integration-tests/AppOne/assets/subdir/subsubdir/test.txt b/tools/aapt2/integration-tests/AppOne/assets/subdir/subsubdir/test.txt new file mode 100644 index 000000000000..125194943ec8 --- /dev/null +++ b/tools/aapt2/integration-tests/AppOne/assets/subdir/subsubdir/test.txt @@ -0,0 +1 @@ +subdir/subsubdir/test.txt comes from assets diff --git a/tools/aapt2/integration-tests/AppOne/assets/test.txt b/tools/aapt2/integration-tests/AppOne/assets/test.txt new file mode 100644 index 000000000000..88266de2b4d4 --- /dev/null +++ b/tools/aapt2/integration-tests/AppOne/assets/test.txt @@ -0,0 +1 @@ +test.txt came from assets diff --git a/tools/aapt2/integration-tests/AppOne/assets2/new.txt b/tools/aapt2/integration-tests/AppOne/assets2/new.txt new file mode 100644 index 000000000000..f4963a95503a --- /dev/null +++ b/tools/aapt2/integration-tests/AppOne/assets2/new.txt @@ -0,0 +1 @@ +new.txt came from assets2 diff --git a/tools/aapt2/integration-tests/AppOne/assets2/test.txt b/tools/aapt2/integration-tests/AppOne/assets2/test.txt new file mode 100644 index 000000000000..5d8b36c0d52d --- /dev/null +++ b/tools/aapt2/integration-tests/AppOne/assets2/test.txt @@ -0,0 +1 @@ +test.txt came from assets2 |