Fix ./gradlew build

Reviewed By: erikandre Differential Revision: D8858886 fbshipit-source-id: 44e8536369a43ea3271380c84f9541b41a4e9549
facebook · Jul 16, 2018 · 126de45 · 126de45
1 parent b15b642
commit 126de45
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...ipeline-base/src/main/java/com/facebook/imagepipeline/systrace/DefaultFrescoSystrace.java b/...ipeline-base/src/main/java/com/facebook/imagepipeline/systrace/DefaultFrescoSystrace.java
@@ -70,7 +70,9 @@ public void flush() {
       if (mStringBuilder.length() > 127) {
         mStringBuilder.setLength(127);
       }
-      Trace.beginSection(mStringBuilder.toString());
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+        Trace.beginSection(mStringBuilder.toString());
+      }
     }
 
     @Override

diff --git a/samples/comparison/build.gradle b/samples/comparison/build.gradle
@@ -42,7 +42,7 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.pro'
         }
     }
 

diff --git a/samples/comparison/proguard.pro b/samples/comparison/proguard.pro
@@ -0,0 +1 @@
+-dontwarn com.squareup.picasso.**