From 86de8a911717ce2581b2b8eafd4ad3fd86577e08 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 20 Aug 2013 15:16:58 -0700
Subject: Don't recursively make when calling create_all_symlinks.sh from a
 makefile.

The target files should be built as dependencies in the rules that call
create_all_symlinks.sh. We already did this in
sdk/adtproductbuild/Android.mk
and
sdk/monitor/Android.mk.

Bug: 10347826
Change-Id: I465d227baa7c22ad806652ca7eb20262a4bccf6f
---
 adtproductbuild/Android.mk             |  3 +--
 eclipse/scripts/create_all_symlinks.sh | 35 +++++++++++++++++-----------------
 monitor/Android.mk                     |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/adtproductbuild/Android.mk b/adtproductbuild/Android.mk
index a5d0c8bda..124eafba3 100644
--- a/adtproductbuild/Android.mk
+++ b/adtproductbuild/Android.mk
@@ -49,7 +49,7 @@ $(ADT_IDE_JAVA_TARGET) : $(TOPDIR)sdk/adtproductbuild/adt_eclipse_ide \
 	$(hide)rm -rf $(TOPDIR)out/host/eclipse/adtproduct/fbuild/plugins
 	$(hide)rm -rf $(TOPDIR)out/host/eclipse/adtproduct/pbuild/plugins
 	$(hide)mkdir -p $(dir $@)
-	$(hide)$(TOPDIR)sdk/eclipse/scripts/create_all_symlinks.sh -c
+	$(hide) $(TOPDIR)sdk/eclipse/scripts/create_all_symlinks.sh -c
 	$(hide)cd $(TOPDIR)sdk/adtproductbuild && \
 		rm -f ../../$(ADT_IDE_BUILD_LOG) && mkdir -p ../../$(dir $(ADT_IDE_BUILD_LOG)) && \
 		( java -jar ../../external/eclipse-basebuilder/basebuilder-3.6.2/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar \
@@ -167,4 +167,3 @@ $(LOCAL_BUILT_MODULE) : $(ADT_IDE_MODULE_DEPS)
 
 endif
 endif
-
diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh
index a464f510d..45cd15964 100755
--- a/eclipse/scripts/create_all_symlinks.sh
+++ b/eclipse/scripts/create_all_symlinks.sh
@@ -316,23 +316,24 @@ done
 MAKE_TARGETS="$NEW_TARGETS"
 unset NEW_TARGETS
 
-
-if [[ -n $MAKE_TARGETS ]]; then
-  ( # Make sure we have lunch sdk-<something>
-    if [[ ! "$TARGET_PRODUCT" ]]; then
-      warn "## TARGET_PRODUCT is not set, running build/envsetup.sh"
-      . build/envsetup.sh
-      warn "## lunch sdk-eng"
-      lunch sdk-eng
-    fi
-
-    J="4"
-    [[ $(uname) == "Darwin" ]] && J=$(sysctl hw.ncpu | cut -d : -f 2 | tr -d ' ')
-    [[ $(uname) == "Linux"  ]] && J=$(cat /proc/cpuinfo | grep processor | wc -l)
-
-    warn "## Building libs: make -j$J $MAKE_TARGETS"
-    make -j${J} $MAKE_TARGETS
-  )
+if [[ -z $ONLY_COPY_DEPS ]]; then
+  if [[ -n $MAKE_TARGETS ]]; then
+    ( # Make sure we have lunch sdk-<something>
+      if [[ ! "$TARGET_PRODUCT" ]]; then
+        warn "## TARGET_PRODUCT is not set, running build/envsetup.sh"
+        . build/envsetup.sh
+        warn "## lunch sdk-eng"
+        lunch sdk-eng
+      fi
+
+      J="4"
+      [[ $(uname) == "Darwin" ]] && J=$(sysctl hw.ncpu | cut -d : -f 2 | tr -d ' ')
+      [[ $(uname) == "Linux"  ]] && J=$(cat /proc/cpuinfo | grep processor | wc -l)
+
+      warn "## Building libs: make -j$J $MAKE_TARGETS"
+      make -j${J} $MAKE_TARGETS
+    )
+  fi
 fi
 
 # --- Copy resulting files ---
diff --git a/monitor/Android.mk b/monitor/Android.mk
index d1dcfb54c..60e4966af 100644
--- a/monitor/Android.mk
+++ b/monitor/Android.mk
@@ -32,7 +32,7 @@ $(LOCAL_BUILT_MODULE) : $(TOPDIR)sdk/monitor/monitor \
 			$(TOPDIR)sdk/monitor/build.properties \
 			$(MONITOR_DEPS)
 	@mkdir -p $(dir $@)
-	$(hide)$(TOPDIR)sdk/eclipse/scripts/create_all_symlinks.sh -c
+	$(hide) $(TOPDIR)sdk/eclipse/scripts/create_all_symlinks.sh -c
 	$(hide)cd $(TOPDIR)sdk/monitor && \
 		rm -f ../../$(RCP_LOG_FILE) && mkdir -p ../../$(dir $(RCP_LOG_FILE)) && \
 		( java -jar ../../external/eclipse-basebuilder/basebuilder-3.6.2/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar \
-- 
cgit v1.2.3