Rename language+country resources to just language

[android-x86/packages-apps-Gallery2.git] / jni / Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 0b8480e..857fca2 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,18 +2,18 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
+LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -Wno-unused-parameter
 
 LOCAL_SRC_FILES := jni_egl_fence.cpp
 
 LOCAL_SDK_VERSION := 9
 
-LOCAL_LDFLAGS :=  -llog -lEGL
-
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := libjni_eglfence
 
+LOCAL_LDLIBS := -llog -lEGL
+
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -22,7 +22,6 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_CPP_EXTENSION := .cc
-LOCAL_LDFLAGS  := -llog -ljnigraphics
 LOCAL_SDK_VERSION := 9
 LOCAL_MODULE    := libjni_filtershow_filters
 LOCAL_SRC_FILES := filters/gradient.c \
@@ -45,7 +44,8 @@ LOCAL_SRC_FILES := filters/gradient.c \
                    filters/tinyplanet.cc \
                    filters/kmeans.cc
 
-LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops -Wno-unused-parameter
+LOCAL_LDLIBS := -llog -ljnigraphics
 LOCAL_ARM_MODE := arm
 
 include $(BUILD_SHARED_LIBRARY)