diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-19 14:21:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-19 14:21:17 -0700 |
| commit | 7e7035eaf5d8d8a72f5f61f05beb79b842e4f358 (patch) | |
| tree | 87c85d50f5887d061492d76eeeb8e34546d96f6c /Android.mk | |
| parent | 44fbc491a8209552a79eb34c30d4482e2d962868 (diff) | |
| parent | 38478f2cfc651b58dd88274c9a3bb7526c91116b (diff) | |
| download | android_packages_apps_Gallery2-7e7035eaf5d8d8a72f5f61f05beb79b842e4f358.tar.gz android_packages_apps_Gallery2-7e7035eaf5d8d8a72f5f61f05beb79b842e4f358.tar.bz2 android_packages_apps_Gallery2-7e7035eaf5d8d8a72f5f61f05beb79b842e4f358.zip | |
Merge "Modify:Gallery2 for branch Gallery2"
Diffstat (limited to 'Android.mk')
| -rwxr-xr-x | Android.mk | 11 |
1 files changed, 11 insertions, 0 deletions
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)) |