summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorRuei-sung Lin <rslin@google.com>2012-05-31 11:59:31 -0700
committerRuei-sung Lin <rslin@google.com>2012-06-01 20:14:58 -0700
commite5c8ed74768f16e4e82c46a31d5118788dbb3a57 (patch)
tree64d0c3a699058f100a46b9b3983673d719f19234 /Android.mk
parent79b8f0b7dbb65a0dd2c32108688903b8147d35d6 (diff)
downloadandroid_packages_apps_Gallery2-e5c8ed74768f16e4e82c46a31d5118788dbb3a57.zip
android_packages_apps_Gallery2-e5c8ed74768f16e4e82c46a31d5118788dbb3a57.tar.gz
android_packages_apps_Gallery2-e5c8ed74768f16e4e82c46a31d5118788dbb3a57.tar.bz2
Fix b/6590795 dejank photo effect slider
Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 6584c4a..ea71b39 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,5 @@
LOCAL_PATH:= $(call my-dir)
+
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
@@ -19,18 +20,21 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
#LOCAL_SDK_VERSION := current
-LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic
+LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic libjni_eglfence
-LOCAL_REQUIRED_MODULES := libjni_mosaic
+LOCAL_REQUIRED_MODULES := libjni_mosaic libjni_eglfence
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
+include $(call all-makefiles-under, jni)
+
ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
# Use the following include to make gallery test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call all-makefiles-under, $(LOCAL_PATH))
# Use the following include to make camera test apk.
include $(call all-makefiles-under, ../Camera)
+
endif