Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbab7f32 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1

Conflicts:
	res/layout/action_mode.xml

Change-Id: Id4005a098134f089e904ed090acec7ca6f786ad1
parents 3fcec525 725da2fb
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D

LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream

ifeq ($(TARGET_TS_MAKEUP), true)
  LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni
endif

LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_MULTILIB := 32
+4 −0
Original line number Diff line number Diff line
@@ -88,3 +88,7 @@
-keep class com.android.gallery3d.jpegstream.JPEGOutputStream { *; }
-keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; }
-keep class com.android.gallery3d.jpegstream.StreamUtils { *; }

-keep class com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine{
  *;
}
+2.13 KiB
Loading image diff...
+3.82 KiB
Loading image diff...
+3.11 KiB
Loading image diff...
Loading