diff options
author | 2015-06-05 17:29:57 +0000 | |
---|---|---|
committer | 2015-06-08 12:53:21 +0000 | |
commit | b7db691fd3fedb05bb772de03f5171a7490f8127 (patch) | |
tree | 2d1e3321a3f2baf25cec65a12d93f30778de80ac /src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java | |
parent | 84a7c337b457681e59816391feda71ac79577117 (diff) |
Rollback of commit 25f07c5f1ae826d748a4dac61f3adf3deb4edc8f.
*** Reason for rollback ***
Emulator is missing GLIBC_2.7 for certain cases.
*** Original change description ***
Remove the dynamic tool launcher, now that the android tools are static.
--
MOS_MIGRATED_REVID=95302834
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java index 587813b5fd..7ba64f7354 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java @@ -15,11 +15,13 @@ package com.google.devtools.build.lib.rules.android; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; import com.google.devtools.build.lib.analysis.RuleContext; +import com.google.devtools.build.lib.analysis.RunfilesSupport; import com.google.devtools.build.lib.analysis.actions.CommandLine; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.actions.SpawnAction.Builder; @@ -67,6 +69,13 @@ public final class AndroidAaptActionHelper { */ private Iterable<Artifact> getInputs() { if (inputs.isEmpty()) { + // TODO(bazel-team): When using getFilesToRun(), the middleman is + // not expanded. Fix by providing code to expand and use getFilesToRun here. + RunfilesSupport aaptRunnerRunfiles = tools.getToolRunner().getRunfilesSupport(); + Preconditions.checkState(aaptRunnerRunfiles != null, tools.getToolRunner().getLabel()); + // Note the below may be an overapproximation of the actual runfiles, due to "conditional + // artifacts" (see Runfiles.PruningManifest). + Iterables.addAll(inputs, aaptRunnerRunfiles.getRunfilesArtifactsWithoutMiddlemen()); inputs.add(tools.getAndroidJar()); inputs.add(manifest); Iterables.addAll(inputs, Iterables.concat(Iterables.transform(resourceContainers, @@ -164,6 +173,7 @@ public final class AndroidAaptActionHelper { List<String> args = new ArrayList<>(); args.addAll(getArgs(output, actionKind, ResourceType.RESOURCES)); args.addAll(getArgs(output, actionKind, ResourceType.ASSETS)); + args.add(tools.getToolRunner().getExecutable().getExecPathString()); args.add(tools.getAapt().getExecutable().getExecPathString()); args.add("package"); Collections.addAll(args, outputArgs); |