diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java index c9a25b26d6..5d8ef6c27c 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceProcessingAction.java @@ -137,21 +137,11 @@ public class AndroidResourceProcessingAction { defaultValue = "", converter = DependencyAndroidDataListConverter.class, category = "input", - help = "Transitive Data dependencies. These values will be used if not defined in the " + help = "Additional Data dependencies. These values will be used if not defined in the " + "primary resources. The expected format is " - + "resources[#resources]:assets[#assets]:manifest:r.txt:symbols.bin" - + "[,resources[#resources]:assets[#assets]:manifest:r.txt:symbols.bin]") - public List<DependencyAndroidData> transitiveData; - - @Option(name = "directData", - defaultValue = "", - converter = DependencyAndroidDataListConverter.class, - category = "input", - help = "Direct Data dependencies. These values will be used if not defined in the " - + "primary resources. The expected format is " - + "resources[#resources]:assets[#assets]:manifest:r.txt:symbols.bin" - + "[,resources[#resources]:assets[#assets]:manifest:r.txt:symbols.bin]") - public List<DependencyAndroidData> directData; + + "resources[#resources]:assets[#assets]:manifest:r.txt:symbols.txt" + + "[,resources[#resources]:assets[#assets]:manifest:r.txt:symbols.txt]") + public List<DependencyAndroidData> data; @Option(name = "rOutput", defaultValue = "null", @@ -308,15 +298,11 @@ public class AndroidResourceProcessingAction { new PackedResourceTarExpander(expandedOut, working), new FileDeDuplicator(Hashing.murmur3_128(), deduplicatedOut, working)); - List<DependencyAndroidData> data = ImmutableList.<DependencyAndroidData>builder() - .addAll(options.directData) - .addAll(options.transitiveData) - .build(); final AndroidBuilder builder = sdkTools.createAndroidBuilder(); final MergedAndroidData mergedData = resourceProcessor.mergeData( options.primaryData, - data, + options.data, mergedResources, mergedAssets, modifiers, @@ -343,7 +329,7 @@ public class AndroidResourceProcessingAction { options.versionCode, options.versionName, filteredData, - data, + options.data, working.resolve("manifest"), generatedSources, options.packagePath, |