diff options
| author | Ying Wang <wangying@google.com> | 2013-08-23 16:19:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-23 16:19:17 +0000 |
| commit | a2af11851c77884bc9b35f48f6b08a4773f02b64 (patch) | |
| tree | 4635bafc5a63dc4cdf5e494f74da005e993da157 /eclipse | |
| parent | 4ce884fce3233d90e600d8ad8b598e788dd17e48 (diff) | |
| parent | bcd9f583ccb7db6329ba42f2795af5ef53fa5f7f (diff) | |
| download | sdk-a2af11851c77884bc9b35f48f6b08a4773f02b64.zip sdk-a2af11851c77884bc9b35f48f6b08a4773f02b64.tar.gz sdk-a2af11851c77884bc9b35f48f6b08a4773f02b64.tar.bz2 | |
Merge "Don't recursively make when calling create_all_symlinks.sh from a makefile."
Diffstat (limited to 'eclipse')
| -rwxr-xr-x | eclipse/scripts/create_all_symlinks.sh | 35 |
1 files changed, 18 insertions, 17 deletions
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 --- |