summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-11-18 17:57:27 -0800
committerMichael Bestas <mikeioannina@gmail.com>2017-01-04 22:00:42 +0200
commit0e20b4e64a974846888b61c012c5fe2b42c24b78 (patch)
tree8da55befa1a6e793eda95c5b4620160ec6f8abf7
parent42f83ee5aa67143fe2b375e51a2f1785846526e7 (diff)
downloadandroid_packages_apps_Snap-0e20b4e64a974846888b61c012c5fe2b42c24b78.zip
android_packages_apps_Snap-0e20b4e64a974846888b61c012c5fe2b42c24b78.tar.gz
android_packages_apps_Snap-0e20b4e64a974846888b61c012c5fe2b42c24b78.tar.bz2
snap: Fix build
Change-Id: I58bd086164769669cf08810fc3f7ac1cdc7ec374
-rw-r--r--Android.mk6
-rw-r--r--tests/Android.mk4
2 files changed, 5 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index e38155f..bfc0dd9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,8 +50,4 @@ endif
include $(BUILD_PACKAGE)
-include $(call all-makefiles-under,$(LOCAL_PATH)/jni)
-
-ifeq (,$(ONE_SHOT_MAKEFILE))
-include $(call all-makefiles-under,$(LOCAL_PATH)/tests)
-endif
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/tests/Android.mk b/tests/Android.mk
index 920f8f0..1d17623 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -1,3 +1,5 @@
+ifeq (,$(ONE_SHOT_MAKEFILE))
+
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -16,3 +18,5 @@ LOCAL_PACKAGE_NAME := SnapTests
LOCAL_INSTRUMENTATION_FOR := Snap
include $(BUILD_PACKAGE)
+
+endif