summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorZhang Zhenzhen <zhangzz6687@thundersoft.com>2015-03-10 16:40:13 +0800
committerJay Wang <jaywang@codeaurora.org>2015-03-18 22:18:11 -0700
commit38478f2cfc651b58dd88274c9a3bb7526c91116b (patch)
tree2d38112715d53f79e75015ebd985f283affe99f5 /Android.mk
parentd51734fb007055835d706170650aa6765ac32899 (diff)
downloadandroid_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.zip
android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.gz
android_packages_apps_Gallery2-38478f2cfc651b58dd88274c9a3bb7526c91116b.tar.bz2
Modify:Gallery2 for branch Gallery2
Conflicts: res/values-zh-rCN/strings.xml res/values/strings.xml Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
Diffstat (limited to 'Android.mk')
-rwxr-xr-xAndroid.mk11
1 files changed, 11 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 0edfca5..661dac6 100755
--- a/Android.mk
+++ b/Android.mk
@@ -39,6 +39,11 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
+ifeq ($(TARGET_TS_MAKEUP), true)
+ LOCAL_JNI_SHARED_LIBRARIES := libts_detected_face_jni libts_face_beautify_jni
+ LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni
+endif
+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_MULTILIB := 32
@@ -47,6 +52,12 @@ include $(BUILD_PACKAGE)
ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
+ifeq ($(TARGET_TS_MAKEUP), true)
+include $(CLEAR_VARS)
+ LOCAL_PREBUILT_LIBS := jni_makeup_libs/libts_detected_face_jni.so jni_makeup_libs/libts_face_beautify_jni.so
+include $(BUILD_MULTI_PREBUILT)
+endif
+
# Use the following include to make gallery test apk
include $(call all-makefiles-under, $(LOCAL_PATH))