summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-05-29 19:23:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-29 19:23:57 +0000
commit8ffa234955cae8d584bd5e416bed543c1664360f (patch)
treea6242f6fc69376b59e4f6cf053bbb4659e158958
parent88faafd4e7199b28b8bcaa08e6b6d967cb1a7d89 (diff)
parent8296c6132d0eb2d4faa20121e89247040a34c90d (diff)
downloadandroid_packages_apps_Trebuchet-8ffa234955cae8d584bd5e416bed543c1664360f.tar.gz
android_packages_apps_Trebuchet-8ffa234955cae8d584bd5e416bed543c1664360f.tar.bz2
android_packages_apps_Trebuchet-8ffa234955cae8d584bd5e416bed543c1664360f.zip
Merge "Enabling tests for pausing apps" into ub-launcher3-qt-dev
-rw-r--r--tests/Android.mk2
-rw-r--r--tests/res/raw/aardwolf_dummy_app.apkbin83296 -> 75762 bytes
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/Android.mk b/tests/Android.mk
index 978209feb..0c412415c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -69,3 +69,5 @@ LOCAL_PACKAGE_NAME := Launcher3Tests
LOCAL_INSTRUMENTATION_FOR := Launcher3
include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/res/raw/aardwolf_dummy_app.apk b/tests/res/raw/aardwolf_dummy_app.apk
index 39fb368ca..c10732d81 100644
--- a/tests/res/raw/aardwolf_dummy_app.apk
+++ b/tests/res/raw/aardwolf_dummy_app.apk
Binary files differ