Add support for multiple dirs in project_res and project_assets args in android_resource rule

The newly added project_res and project_assets arguments on the android_resouce rule only support one directory but there are cases where you would want to specify multiple, such as in a top level application module that has multiple buildTypes or flavors.

cc @kageiit

[k21]

Did you try not specifying those attributes? In that case Buck should generate appropriate symlink trees based on the res and assets attributes which support an arbitrary number of source directories. The project_* attributes should only be useful if artifact building during project generation is disabled.

[kageiit]

For a project with gradle like strcuture, This snippet of change made all the symbols resolve work correctly again.

diff --git a/src/com/facebook/buck/jvm/java/intellij/IjProjectTemplateDataPreparer.java b/src/com/facebook/buck/jvm/java/intellij/IjProjectTemplateDataPreparer.java
index dfa588a4c..10682a8ab 100644
--- a/src/com/facebook/buck/jvm/java/intellij/IjProjectTemplateDataPreparer.java
+++ b/src/com/facebook/buck/jvm/java/intellij/IjProjectTemplateDataPreparer.java
@@ -240,7 +240,10 @@ public class IjProjectTemplateDataPreparer {
     ImmutableSortedSet<IjSourceFolder> sourceFolders = simplifiedFolders
         .stream()
         .map(transformToFolder::apply)
+        .filter(folder -> !(folder.getType().equals("excludeFolder")
+            && (folder.getUrl().endsWith("/res") || folder.getUrl().endsWith("/assets"))))
         .collect(MoreCollectors.toImmutableSortedSet(Ordering.natural()));
+
     return ContentRoot.builder()
         .setUrl(url)
         .setFolders(sourceFolders)
diff --git a/src/com/facebook/buck/jvm/java/intellij/ij-module.st b/src/com/facebook/buck/jvm/java/intellij/ij-module.st
index 48f442413..fcc138839 100644
--- a/src/com/facebook/buck/jvm/java/intellij/ij-module.st
+++ b/src/com/facebook/buck/jvm/java/intellij/ij-module.st
@@ -8,6 +8,7 @@
         <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="%androidFacet.module_gen_path%" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="%androidFacet.android_manifest%" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="%androidFacet.res%" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="%androidFacet.asset_folder%" />
         <option name="LIBS_FOLDER_RELATIVE_PATH" value="%androidFacet.libs_path%" />
         <option name="APK_PATH" value="%androidFacet.apk_path%" />

There still seem to be many general issues with buck project file generation for projects that have a gradle like structure. Missing paths or paths pointing to the filesystem where there are no generated files (like the MANIFEST_FILE_RELATIVE_PATH for a project which is not a library is always set to a file that does not exist yet) even when buck project is invoked with building.