diff options
| author |  Benjamin Peterson <bp@benjamin.pe> | 2017-11-09 22:45:17 +0100 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-11-10 23:27:35 +0100 |
| commit | 10b0d8aa6b73a024cc007c5e075cb329add878ef (patch) | |
| tree | eea23ecadc0ddbce751630460cec52813fdb1d72 /src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java | |
| parent | 7a0af171c9922511befcd2ed993a91c89d19a94a (diff) | |
Ban middlemen from runfiles artifacts.
Previous changes have removed all middlemen from runfiles
artifacts. This CL locks it down and removes various now-redundant
*WithoutMiddlemen() methods from Runfiles.
I put a check for middlemen in ConflictChecker.put, which should be a
chokepoint for runfiles artifacts. It's unfortunate we can't detect
middlemen earlier than execution, but I can't see a way to efficiently
check every runfiles artifact earlier.
Change-Id: I57fcb51b02e40adf3ebc4591c26bf5492c89352f
PiperOrigin-RevId: 175206157
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java index f6cf02e841..16505b92b8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/RClassGeneratorActionBuilder.java @@ -85,7 +85,7 @@ public class RClassGeneratorActionBuilder { ruleContext .getExecutablePrerequisite("$android_resources_busybox", Mode.HOST) .getRunfilesSupport() - .getRunfilesArtifactsWithoutMiddlemen()); + .getRunfilesArtifacts()); List<Artifact> outs = new ArrayList<>(); if (primary.getRTxt() != null) { |