From 38478f2cfc651b58dd88274c9a3bb7526c91116b Mon Sep 17 00:00:00 2001
From: Zhang Zhenzhen <zhangzz6687@thundersoft.com>
Date: Tue, 10 Mar 2015 16:40:13 +0800
Subject: Modify:Gallery2 for branch Gallery2

Conflicts:
	res/values-zh-rCN/strings.xml
        res/values/strings.xml
Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
---
 Android.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 0edfca54d..661dac6ae 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))
 
-- 
cgit v1.2.3