diff options
-rw-r--r-- | Android.mk | 6 | ||||
-rw-r--r-- | tests/Android.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index e38155ffd..bfc0dd91e 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 920f8f0ff..1d17623d2 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 |