Restore configuration expansion behavior for android targets to make …

…tests work correctly
uber · Aug 1, 2017 · ead6fdb · ead6fdb
1 parent 75b27e2
commit ead6fdb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...rc/src/main/groovy/com/uber/okbuck/core/model/android/AndroidInstrumentationTarget.groovy b/...rc/src/main/groovy/com/uber/okbuck/core/model/android/AndroidInstrumentationTarget.groovy
@@ -37,7 +37,7 @@ class AndroidInstrumentationTarget extends AndroidAppTarget {
     Scope getMain() {
         return new Scope(
                 project,
-                expand(compileConfigs, ANDROID_TEST_PREFIX) + expand(compileConfigs),
+                expand(compileConfigs, ANDROID_TEST_PREFIX),
                 getSources(baseVariant),
                 null,
                 getJavaCompilerOptions(baseVariant))

diff --git a/buildSrc/src/main/groovy/com/uber/okbuck/core/model/android/AndroidTarget.groovy b/buildSrc/src/main/groovy/com/uber/okbuck/core/model/android/AndroidTarget.groovy
@@ -399,6 +399,9 @@ abstract class AndroidTarget extends JavaLibTarget {
                 expanded.substring(0, 1).toLowerCase() + expanded.substring(1)
             }
         }.flatten() as Set<String>
+        if (prefix) {
+            expandedConfigs += expand(configNames)
+        }
         return expandedConfigs
     }