From 896d7135df736020e1adc83b793288fd34b6f1d9 Mon Sep 17 00:00:00 2001 From: Andrew Pellegrini Date: Wed, 23 Sep 2015 15:06:24 +0000 Subject: Fix ApplicationManifest#generatedManifest bug that would set the package as 'null' if the rule was not under either the java or javatests trees. Uses AndroidCommon#getJavaPackage to ensure consistent behavior. -- MOS_MIGRATED_REVID=103746264 --- .../devtools/build/lib/rules/android/ApplicationManifest.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/ApplicationManifest.java') 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 7be804a50c..d67ba0965d 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 @@ -33,7 +33,6 @@ import com.google.devtools.build.lib.rules.android.AndroidResourcesProvider.Reso import com.google.devtools.build.lib.rules.android.AndroidResourcesProvider.ResourceType; import com.google.devtools.build.lib.rules.android.LocalResourceContainer.Builder.InvalidAssetPath; import com.google.devtools.build.lib.rules.android.LocalResourceContainer.Builder.InvalidResourcePath; -import com.google.devtools.build.lib.rules.java.JavaUtil; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.lib.vfs.PathFragment; @@ -149,13 +148,7 @@ public final class ApplicationManifest { ruleContext.getRule().getName() + "_generated", new PathFragment("AndroidManifest.xml"), ruleContext.getBinOrGenfilesDirectory()); - String manifestPackage; - if (ruleContext.attributes().isAttributeValueExplicitlySpecified("custom_package")) { - manifestPackage = ruleContext.attributes().get("custom_package", Type.STRING); - } else { - manifestPackage = JavaUtil.getJavaFullClassname( - ruleContext.getRule().getPackage().getNameFragment()); - } + String manifestPackage = AndroidCommon.getJavaPackage(ruleContext); String contents = Joiner.on("\n").join( "", "