Revert "Add empty resource rule if using resource union. (#438)"

This reverts commit 406e95e.
uber · May 30, 2017 · e9f1e2c · e9f1e2c
1 parent b29730d
commit e9f1e2c
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -62,7 +62,6 @@ dependencies {
     compile deps.external.xlogAndroidIdle
     compile deps.apt.autoValue
 
-    compile project(':libraries:emptyResourceLibrary')
     compile project(':libraries:emptylibrary')
     devCompile project(path: ':dummylibrary', configuration: 'freeRelease')
     prodCompile project(path: ':dummylibrary', configuration: 'paidRelease')

diff --git a/buildSrc/src/main/groovy/com/uber/okbuck/rule/android/AndroidResourceRule.groovy b/buildSrc/src/main/groovy/com/uber/okbuck/rule/android/AndroidResourceRule.groovy
@@ -22,7 +22,7 @@ final class AndroidResourceRule extends BuckRule {
     @Override
     protected final void printContent(PrintStream printer) {
         printer.println("\tpackage = '${mPackage}',")
-        if (mRes || mResourceUnion) {
+        if (mRes) {
             printer.println("\tres = res_glob([")
             mRes.each {
                 printer.println("\t\t('${it}', '**'),")

diff --git a/libraries/emptyResourceLibrary/build.gradle b/libraries/emptyResourceLibrary/build.gradle
diff --git a/libraries/emptyResourceLibrary/src/main/AndroidManifest.xml b/libraries/emptyResourceLibrary/src/main/AndroidManifest.xml
diff --git a/...ries/emptyResourceLibrary/src/main/java/com/uber/okbuck/library/empty/resources/Test.java b/...ries/emptyResourceLibrary/src/main/java/com/uber/okbuck/library/empty/resources/Test.java
diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,6 @@
 include 'app'
 include 'another-app'
 include 'dummylibrary'
-include 'libraries:emptyResourceLibrary'
 include 'libraries:common'
 include 'libraries:customLintLibrary'
 include 'libraries:emptylibrary'