Merge branch 'android-graphics:idea/242.21829.142' into newProject

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