From 9a5cd762a6faf547c436ee3cda3624748d6095c5 Mon Sep 17 00:00:00 2001 From: Ruei-sung Lin Date: Thu, 31 May 2012 11:59:31 -0700 Subject: Fix b/6590795 dejank photo effect slider Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea --- Android.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 6584c4a3f..ea71b3958 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 -- cgit v1.2.3