inline proguard rules

Summary: Android library should maintain their own proguard rules like butterknife, so library user should manually copy and paste proguard rules everytime the rules updated. Test current sample app works as expect. Closes #2075 Reviewed By: kirwan Differential Revision: D7380382 Pulled By: lambdapioneer fbshipit-source-id: fcb50047db89bceb53a6579deb39349ff0a3716f
facebook · Mar 26, 2018 · 0e9aba2 · 0e9aba2
1 parent eb9df5b
commit 0e9aba2
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/fbcore/build.gradle b/fbcore/build.gradle
@@ -33,6 +33,10 @@ android {
 
     useLibrary 'org.apache.http.legacy'
 
+    defaultConfig {
+        consumerProguardFiles 'proguard-fresco.pro'
+    }
+
     packagingOptions {
       exclude 'LICENSE'
       exclude 'LICENSE.txt'

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

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

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

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

diff --git a/samples/showcase/build.gradle b/samples/showcase/build.gradle
@@ -24,7 +24,7 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), '../../proguard-fresco.pro', 'proguard-showcase.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-showcase.pro'
         }
     }
     flavorDimensions "main"

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