diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2018-04-01 20:16:59 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2018-04-05 14:12:04 +0300 |
| commit | 08dd2c9b865d951da8090bf9fe93f1b38bcb18e0 (patch) | |
| tree | 0b300493fb3b2ffb137cb5cff6dbc1e88fdd309f /proguard.flags | |
| parent | 1554c64284052e4173dfb93c0222c55a6746dfa3 (diff) | |
| parent | f50ea21bfbc7fd71d2700f2f5a1657f7f2094630 (diff) | |
| download | android_packages_apps_Gallery2-08dd2c9b865d951da8090bf9fe93f1b38bcb18e0.tar.gz android_packages_apps_Gallery2-08dd2c9b865d951da8090bf9fe93f1b38bcb18e0.tar.bz2 android_packages_apps_Gallery2-08dd2c9b865d951da8090bf9fe93f1b38bcb18e0.zip | |
Merge tag 'android-8.1.0_r15' of https://android.googlesource.com/platform/packages/apps/Gallery2 into HEAD
Android 8.1.0 Release 15 (OPM1.171019.021)
* Excludes "Adaptive icon for Gallery2 AOSP" since we have our own icon
Conflicts:
Android.mk
AndroidManifest.xml
jni/Android.mk
jni/filters/geometry.c
proguard.flags
res/values/colors.xml
src/com/android/gallery3d/filtershow/pipeline/Buffer.java
Change-Id: I003571ce6e7719e4d110fd9b546126e52eef1204
Diffstat (limited to 'proguard.flags')
| -rw-r--r-- | proguard.flags | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/proguard.flags b/proguard.flags index ea0d09fa2..0099a01c5 100644 --- a/proguard.flags +++ b/proguard.flags @@ -87,6 +87,9 @@ -keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; } -keep class com.android.gallery3d.jpegstream.StreamUtils { *; } --keep class com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine{ +# TODO: remove or rename android.util.Pools.java from our source. +-dontwarn android.util.Pools* + +-keep class com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine { *; } |