Do not use manifest_skeleton for instrumentation apk rules

uber · Dec 13, 2017 · 9412088 · 9412088
1 parent b531477
commit 9412088
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...main/groovy/com/uber/okbuck/composer/android/AndroidInstrumentationApkRuleComposer.groovy b/...main/groovy/com/uber/okbuck/composer/android/AndroidInstrumentationApkRuleComposer.groovy
@@ -16,7 +16,7 @@ final class AndroidInstrumentationApkRuleComposer extends AndroidBuckRuleCompose
  AndroidInstrumentationTarget target,
  AndroidAppTarget mainApkTarget) {
  return new InstrumentationApkRule()
- .manifestSkeleton(fileRule(target.manifest))
+ .manifest(fileRule(target.manifest))
  .mainApkRuleName(bin(mainApkTarget))
  .defaultVisibility()
  .ruleType(RuleType.ANDROID_INSTRUMENTATION_APK.buckName)

diff --git a/buildSrc/src/main/rocker/com/uber/okbuck/template/android/InstrumentationApkRule.rocker.raw b/buildSrc/src/main/rocker/com/uber/okbuck/template/android/InstrumentationApkRule.rocker.raw
@@ -1,6 +1,6 @@
-@args (String manifestSkeleton, String mainApkRuleName)
+@args (String manifest, String mainApkRuleName)
 @com.uber.okbuck.template.base.BuckRule.template() -> {
- manifest_skeleton = '@manifestSkeleton',
+ manifest = '@manifest',
  dex_tool = 'd8',
  apk = ':@mainApkRuleName',
 }