From 8056c4577614f3d6374a01b8b3014a2070e1fe41 Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 7 Mar 2016 16:41:57 +0000 Subject: Support android_resources in Android Studio. -- MOS_MIGRATED_REVID=116549753 --- .../com/google/devtools/build/lib/rules/android/AndroidCommon.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java index 061018ce90..68a0849f19 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java @@ -246,7 +246,6 @@ public class AndroidCommon { Iterable apksUnderTest) { AndroidIdeInfoProvider.Builder ideInfoProviderBuilder = new AndroidIdeInfoProvider.Builder() - .setJavaPackage(getJavaPackage(ruleContext)) .setIdlClassJar(idlHelper.getIdlClassJar()) .setIdlSourceJar(idlHelper.getIdlSourceJar()) .addIdlParcelables(idlHelper.getIdlParcelables()) @@ -269,7 +268,8 @@ public class AndroidCommon { getAssetDir(ruleContext)) // Sets the possibly merged manifest and the raw manifest. .setGeneratedManifest(resourceApk.getPrimaryResource().getManifest()) - .setManifest(ruleContext.getPrerequisiteArtifact("manifest", Mode.TARGET)); + .setManifest(ruleContext.getPrerequisiteArtifact("manifest", Mode.TARGET)) + .setJavaPackage(getJavaPackage(ruleContext)); } else { semantics.addNonLocalResources(ruleContext, resourceApk, ideInfoProviderBuilder); } -- cgit v1.2.3