summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rwxr-xr-xjni/Android.mk12
-rw-r--r--tests/Android.mk2
3 files changed, 3 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk
index c51a8a6..2d7b544 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,4 +38,4 @@ endif
include $(BUILD_PACKAGE)
-#include $(call all-makefiles-under, $(LOCAL_PATH))
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/jni/Android.mk b/jni/Android.mk
index af2d814..c94a807 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -40,17 +40,7 @@ LOCAL_SRC_FILES := \
feature_stab/src/dbreg/dbstabsmooth.cpp \
feature_stab/src/dbreg/vp_motionmodel.c
-ifeq ($(TARGET_ARCH), arm)
- LOCAL_SDK_VERSION := 9
-endif
-
-ifeq ($(TARGET_ARCH), x86)
- LOCAL_SDK_VERSION := 9
-endif
-
-ifeq ($(TARGET_ARCH), mips)
- LOCAL_SDK_VERSION := 9
-endif
+LOCAL_SDK_VERSION := 9
LOCAL_LDFLAGS := -llog -lGLESv2
diff --git a/tests/Android.mk b/tests/Android.mk
index 9f33322..6ba0a59 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -15,4 +15,4 @@ LOCAL_PACKAGE_NAME := Camera2Tests
LOCAL_INSTRUMENTATION_FOR := Camera2
-include $(BUILD_PACKAGE)
+#include $(BUILD_PACKAGE)