diff options
Diffstat (limited to 'src/main/java')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index b42d29b9f1..97715cb689 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -466,7 +466,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { Artifact deployInfo = ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.DEPLOY_INFO); AndroidDeployInfoAction.createDeployInfoAction(ruleContext, deployInfo, - applicationManifest.getManifest(), + resourceApk.getManifest(), additionalMergedManifests, Iterables.concat(ImmutableList.of(zipAlignedApk), apksUnderTest), dataDeps); @@ -541,7 +541,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { AndroidDeployInfoAction.createDeployInfoAction(ruleContext, incrementalDeployInfo, - applicationManifest.getManifest(), + resourceApk.getManifest(), additionalMergedManifests, ImmutableList.<Artifact>of(), dataDeps); @@ -640,7 +640,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { AndroidDeployInfoAction.createDeployInfoAction( ruleContext, splitDeployInfo, - applicationManifest.getManifest(), + resourceApk.getManifest(), additionalMergedManifests, ImmutableList.<Artifact>of(), dataDeps); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java index 4bcb967363..72741f7bc5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java @@ -124,9 +124,9 @@ public final class AndroidRuleClasses { fromTemplates("%{name}_symbols/local-R.txt"); public static final ImplicitOutputsFunction ANDROID_PROCESSED_MANIFEST = fromTemplates("%{name}_processed_manifest/AndroidManifest.xml"); - public static final SafeImplicitOutputsFunction MOBILE_INSTALL_STUB_APPLICATON_MANIFEST = + public static final SafeImplicitOutputsFunction MOBILE_INSTALL_STUB_APPLICATION_MANIFEST = fromTemplates("%{name}_files/mobile_install/AndroidManifest.xml"); - public static final SafeImplicitOutputsFunction INSTANT_RUN_STUB_APPLICATON_MANIFEST = + public static final SafeImplicitOutputsFunction INSTANT_RUN_STUB_APPLICATION_MANIFEST = fromTemplates("%{name}_files/instant_run/AndroidManifest.xml"); public static final SafeImplicitOutputsFunction FULL_DEPLOY_MARKER = fromTemplates("%{name}_files/full_deploy_marker"); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java index 1511af5b5e..48ee3687b8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java @@ -88,7 +88,7 @@ public final class ApplicationManifest { throws InterruptedException { Artifact stubManifest = ruleContext.getImplicitOutputArtifact( - AndroidRuleClasses.MOBILE_INSTALL_STUB_APPLICATON_MANIFEST); + AndroidRuleClasses.MOBILE_INSTALL_STUB_APPLICATION_MANIFEST); SpawnAction.Builder builder = new SpawnAction.Builder() .setExecutable(ruleContext.getExecutablePrerequisite("$stubify_manifest", Mode.HOST)) @@ -118,7 +118,7 @@ public final class ApplicationManifest { throws InterruptedException { Artifact stubManifest = ruleContext.getImplicitOutputArtifact( - AndroidRuleClasses.INSTANT_RUN_STUB_APPLICATON_MANIFEST); + AndroidRuleClasses.INSTANT_RUN_STUB_APPLICATION_MANIFEST); SpawnAction.Builder builder = new SpawnAction.Builder() .setExecutable(ruleContext.getExecutablePrerequisite("$stubify_manifest", Mode.HOST)) |