From 5963ae7407f32cf25ebbe7e046f5bc5d0240aae3 Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 29 Aug 2016 17:06:53 +0000 Subject: Add a lightweight resource merge action. Part 2 of the 3 new proposed android_library res processing actions. The primary and deps are all assumed to be parsed+summarized in a protobuf. Represent that with a new class (similar to DependencyAndroidData but w/out R.txt). Avoid having "manifest" artifacts as deps input, and instead use "label", since that is only used in a warning. DepAD still uses the manifest for #asSymbolFileProvider, so we keep it there. Move loading the primary out of the merge function so that we can share the merge function with this style of primary data, and the existing style of of primary data (UnvalidatedAndroidData). This produces an R class.jar and a zip file to pass along to a future validation action. Images are stubbed out since they are irrelevant to the validation action. -- MOS_MIGRATED_REVID=131604421 --- .../com/google/devtools/build/android/AndroidResourceParsingAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceParsingAction.java') diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceParsingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceParsingAction.java index e48440db48..65ff00aadf 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceParsingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceParsingAction.java @@ -45,7 +45,7 @@ public class AndroidResourceParsingAction { converter = UnvalidatedAndroidDirectoriesConverter.class, category = "input", help = "The resource and asset directories to parse and summarize in a symbols file." - + " The expected format is resources[#resources]:assets[#assets]") + + " The expected format is " + UnvalidatedAndroidDirectories.EXPECTED_FORMAT) public UnvalidatedAndroidDirectories primaryData; @Option(name = "output", -- cgit v1.2.3