Removed unnecessary orderEntry and reformated to follow the style guide

build_sherlock_platform.sh

@@ -12,9 +12,23 @@ BUILD_PROPERTIES=(
   "-Dbuild.number=${AS_BUILD_NUMBER}"
   "-Dintellij.build.dev.mode=false"
   "-Dcompile.parallel=true"
-  "-Dintellij.build.skip.build.steps=repair_utility_bundle_step,mac_dmg,mac_sign,mac_sit,windows_exe_installer,linux aarch64,windows aarch64,mac x64" # TODO
-  "-Dintellij.build.incremental.compilation=true" # TODO
+  "-Dintellij.build.skip.build.steps=repair_utility_bundle_step,mac_dmg,mac_sign,mac_sit,windows_exe_installer,linux aarch64,windows aarch64,mac x64"
+  "-Dintellij.build.incremental.compilation=true"
   "-Dintellij.build.incremental.compilation.fallback.rebuild=false"
 )
 
+# Use --with-android to update/download android repo before building
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --with-android)
+      ./getPlugins.sh --shallow
+      shift
+      ;;
+    *)
+      echo "Unknown option: $1" >&2
+      exit 1
+      ;;
+  esac
+done
+
 "${PROG_DIR}/platform/jps-bootstrap/jps-bootstrap.sh" "${BUILD_PROPERTIES[@]}" "${PROG_DIR}" intellij.idea.community.build SherlockPlatformBuild

getPlugins.sh

@@ -16,9 +16,13 @@ readonly TAG="idea/${AS_BUILD_NUMBER}.${SNAPSHOT}"
 
 echo "Cloning Jetbrains/android repository using the following tag: ${TAG}"
 
-if [ "$1" == "--shallow" ]; then
+if [ ! -d "android" ]; then
+  if [ "$1" == "--shallow" ]; then
     git clone git://git.jetbrains.org/idea/android.git android --depth 1 --branch "${TAG}"
-else
+  else
     echo "Warning: Cloning with the entire history. Use the --shallow flag to clone faster."
     git clone git://git.jetbrains.org/idea/android.git android --branch "${TAG}"
-fi
+  fi
+else
+  echo "Android directory already exists. Skipping clone."
+fi

platform/sherlock-customization/com.google.sherlock.customization.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

sherlock-platform/customization/com.google.sherlock.customization.iml

@@ -9,8 +9,5 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="module" module-name="intellij.idea.customization.base" />
-    <orderEntry type="module" module-name="intellij.platform.experiment" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
   </component>
 </module>

sherlock-platform/customization/resources/META-INF/SherlockPlatformCustomization.xml

@@ -5,7 +5,7 @@
     <actions resource-bundle="messages.ActionsBundle">
         <group id="WelcomeScreen.Platform.NewProject">
             <action id="NewProjectStep"
-                    class="com.google.sherlock.onboardingFlow.NewProjectStep"
+                    class="com.google.sherlock.onboarding.NewProjectStep"
                     text="New Project"/>
             <reference ref="WelcomeScreen.OpenDirectoryProject"/>
             <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>

sherlock-platform/customization/src/com/google/sherlock/onboardingFlow/NewProjectStep.java → sherlock-platform/customization/src/com/google/sherlock/onboarding/NewProjectStep.java

@@ -13,7 +13,7 @@
  * limitations under the License.
  ***/
 
-package com.google.sherlock.onboardingFlow;
+package com.google.sherlock.onboarding;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;