diff options
| author | Leena Winterrowd <lenhardw@codeaurora.org> | 2014-08-21 15:19:33 -0700 |
|---|---|---|
| committer | Leena Winterrowd <lenhardw@codeaurora.org> | 2014-08-22 18:56:33 -0700 |
| commit | 6c0e99e487a894718da681c5bdf1c8a4208ccec4 (patch) | |
| tree | adc09c575e1aa88f76fe31309a9c10b9ebc866f3 | |
| parent | d01b7b87bfb11c3f58456e010af5952863e9a61a (diff) | |
| download | android_packages_apps_Snap-6c0e99e487a894718da681c5bdf1c8a4208ccec4.tar.gz android_packages_apps_Snap-6c0e99e487a894718da681c5bdf1c8a4208ccec4.tar.bz2 android_packages_apps_Snap-6c0e99e487a894718da681c5bdf1c8a4208ccec4.zip | |
SnapdragonCamera: Enable build of local jni libraries
The app currently relies on having its required libraries in the
current build. Enable building its local libraries so that these
are always present. Also ensure that the camera tests are not built
to avoid a naming conflict.
Change-Id: If358db3fc7392f62aaaa84877baa19a949aea497
| -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) |