diff options
author | Googler <noreply@google.com> | 2016-03-07 16:41:57 +0000 |
---|---|---|
committer | Damien Martin-Guillerez <dmarting@google.com> | 2016-03-08 03:44:31 +0000 |
commit | 8056c4577614f3d6374a01b8b3014a2070e1fe41 (patch) | |
tree | 2db52a8be8b0362f85b07c7ef036cd8a5a7a1711 /src/main/java/com/google/devtools/build/lib/rules/android | |
parent | 3a55f01cc98068d0133349ddb5c0043b74555565 (diff) |
Support android_resources in Android Studio.
--
MOS_MIGRATED_REVID=116549753
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 4 |
1 files changed, 2 insertions, 2 deletions
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<Artifact> 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); } |