Skip to content

Commit

Permalink
Fix aapt2 with mobile-install v1
Browse files Browse the repository at this point in the history
Previously, the resource apk was always built with aapt regardless of configuration. This threads the aapt version into the resource processing action builder.

Fixes: #5799

Ref: #6814

RELNOTES: mobile-install now works with aapt2. Try it out with `bazel mobile-install --android_aapt=aapt2 //my:target`
PiperOrigin-RevId: 224566567
  • Loading branch information
jin authored and Copybara-Service committed Dec 7, 2018
1 parent e7da94f commit 821efbd
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ public static ProcessedAndroidData processIncrementalBinaryDataFrom(

AndroidResourcesProcessorBuilder builder =
builderForTopLevelTarget(dataContext, manifest, proguardPrefix, manifestValues)
.targetAaptVersion(AndroidAaptVersion.chooseTargetAaptVersion(ruleContext))
.setApkOut(apkOut)
.setMergedResourcesOut(mergedResourcesOut);

Expand Down

0 comments on commit 821efbd

Please sign in to comment.