Merge pull request facebook#1 in ANDROID/buck from no/intellij to master

* commit '2b64271f46b16b405aec59dfae6b1aaa4b5e58dc': Fix Intellij project set up for buck.
runningcode · Apr 13, 2017 · 74de19f · 74de19f
2 parents 5f1604d + 2b64271
commit 74de19f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/com/facebook/buck/ide/intellij/IjProjectTemplateDataPreparer.java b/src/com/facebook/buck/ide/intellij/IjProjectTemplateDataPreparer.java
@@ -177,6 +177,8 @@ private ContentRoot createContentRoot(
     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)

diff --git a/src/com/facebook/buck/ide/intellij/ij-module.st b/src/com/facebook/buck/ide/intellij/ij-module.st
@@ -11,6 +11,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%" />