diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rwxr-xr-x | jni/Android.mk | 12 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk index c51a8a633..2d7b54422 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 af2d81462..c94a8075d 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 9f33322f2..6ba0a5971 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) |