diff options
Diffstat (limited to 'src/main/java/com/google/devtools')
4 files changed, 6 insertions, 6 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 719ac03477..bd566b243c 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 @@ -233,7 +233,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { false, /* incremental */ ProguardHelper.getProguardConfigArtifact(ruleContext, ""), createMainDexProguardSpec(ruleContext), - null, /* manifestOut */ + ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_PROCESSED_MANIFEST), ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_RESOURCES_ZIP)); if (ruleContext.hasErrors()) { return null; diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java index 9bff63a070..eae49fb328 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibrary.java @@ -97,7 +97,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory { false, null /* proguardCfgOut */, null, /* mainDexProguardCfg */ - ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_LIBRARY_MANIFEST), + ruleContext.getImplicitOutputArtifact(AndroidRuleClasses.ANDROID_PROCESSED_MANIFEST), null /* mergedResourcesOut */); if (ruleContext.hasErrors()) { return null; @@ -167,7 +167,7 @@ public abstract class AndroidLibrary implements RuleConfiguredTargetFactory { .setApkOut(apk) .setRTxtOut(resourceContainer.getRTxt()) .setManifestOut(ruleContext.getImplicitOutputArtifact( - AndroidRuleClasses.ANDROID_LIBRARY_MANIFEST)) + AndroidRuleClasses.ANDROID_PROCESSED_MANIFEST)) .setSourceJarOut(resourceContainer.getJavaSourceJar()) .setJavaPackage(resourceContainer.getJavaPackage()) .withPrimary(resourceContainer) 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 b48e8b5559..b5a3cd36f1 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 @@ -120,8 +120,8 @@ public final class AndroidRuleClasses { fromTemplates("%{name}_symbols/R.txt"); public static final SafeImplicitOutputsFunction ANDROID_SYMBOLS_TXT = fromTemplates("%{name}_symbols/local-R.txt"); - public static final ImplicitOutputsFunction ANDROID_LIBRARY_MANIFEST = - fromTemplates("%{name}_library_manifest/AndroidManifest.xml"); + public static final ImplicitOutputsFunction ANDROID_PROCESSED_MANIFEST = + fromTemplates("%{name}_processed_manifest/AndroidManifest.xml"); public static final SafeImplicitOutputsFunction STUB_APPLICATON_MANIFEST = fromTemplates("%{name}_files/stub/AndroidManifest.xml"); public static final SafeImplicitOutputsFunction 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 252ed1e8e9..4f992aa0a7 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 @@ -361,7 +361,7 @@ public final class ApplicationManifest { ResourceContainer processed = builder.build(ruleContext); return new ResourceApk( - resourceApk, processed.getJavaSourceJar(), resourceDeps, processed, manifest, + resourceApk, processed.getJavaSourceJar(), resourceDeps, processed, processed.getManifest(), proguardCfg, mainDexProguardCfg, false); } |