diff options
| -rw-r--r-- | adtproductbuild/Android.mk | 3 | ||||
| -rwxr-xr-x | eclipse/scripts/create_all_symlinks.sh | 35 | ||||
| -rw-r--r-- | monitor/Android.mk | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/adtproductbuild/Android.mk b/adtproductbuild/Android.mk index a5d0c8b..124eafb 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 a464f51..45cd159 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 d1dcfb5..60e4966 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 \ |