diff options
| author | Ruei-sung Lin <rslin@google.com> | 2012-05-31 11:59:31 -0700 |
|---|---|---|
| committer | Ruei-sung Lin <rslin@google.com> | 2012-06-01 20:14:58 -0700 |
| commit | 9a5cd762a6faf547c436ee3cda3624748d6095c5 (patch) | |
| tree | 3c303056edf6935d8580032cc75eebae73e78ffd | |
| parent | 5a4d66d474ec876a2a28fd5927890c18f18907e5 (diff) | |
| download | android_packages_apps_Snap-9a5cd762a6faf547c436ee3cda3624748d6095c5.tar.gz android_packages_apps_Snap-9a5cd762a6faf547c436ee3cda3624748d6095c5.tar.bz2 android_packages_apps_Snap-9a5cd762a6faf547c436ee3cda3624748d6095c5.zip | |
Fix b/6590795 dejank photo effect slider
Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
| -rw-r--r-- | Android.mk | 10 | ||||
| -rw-r--r-- | jni/Android.mk | 16 |
2 files changed, 23 insertions, 3 deletions
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 diff --git a/jni/Android.mk b/jni/Android.mk new file mode 100644 index 000000000..eedfa0bff --- /dev/null +++ b/jni/Android.mk @@ -0,0 +1,16 @@ +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES + +LOCAL_SRC_FILES := jni_egl_fence.cpp + +LOCAL_SHARED_LIBRARIES := libcutils libEGL + +LOCAL_MODULE_TAGS := optional + +LOCAL_MODULE := libjni_eglfence + +include $(BUILD_SHARED_LIBRARY) + |