| OLD | NEW | 
|    1 # Copyright 2012 the V8 project authors. All rights reserved. |    1 # Copyright 2012 the V8 project authors. All rights reserved. | 
|    2 # Redistribution and use in source and binary forms, with or without |    2 # Redistribution and use in source and binary forms, with or without | 
|    3 # modification, are permitted provided that the following conditions are |    3 # modification, are permitted provided that the following conditions are | 
|    4 # met: |    4 # met: | 
|    5 # |    5 # | 
|    6 #     * Redistributions of source code must retain the above copyright |    6 #     * Redistributions of source code must retain the above copyright | 
|    7 #       notice, this list of conditions and the following disclaimer. |    7 #       notice, this list of conditions and the following disclaimer. | 
|    8 #     * Redistributions in binary form must reproduce the above |    8 #     * Redistributions in binary form must reproduce the above | 
|    9 #       copyright notice, this list of conditions and the following |    9 #       copyright notice, this list of conditions and the following | 
|   10 #       disclaimer in the documentation and/or other materials provided |   10 #       disclaimer in the documentation and/or other materials provided | 
|   11 #       with the distribution. |   11 #       with the distribution. | 
|   12 #     * Neither the name of Google Inc. nor the names of its |   12 #     * Neither the name of Google Inc. nor the names of its | 
|   13 #       contributors may be used to endorse or promote products derived |   13 #       contributors may be used to endorse or promote products derived | 
|   14 #       from this software without specific prior written permission. |   14 #       from this software without specific prior written permission. | 
|   15 # |   15 # | 
|   16 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |   16 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 
|   17 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |   17 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 
|   18 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |   18 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
|   19 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |   19 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 
|   20 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |   20 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
|   21 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |   21 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 
|   22 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |   22 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
|   23 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |   23 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
|   24 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |   24 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
|   25 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |   25 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
|   26 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |   26 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|   27  |   27  | 
|   28 # Those definitions should be consistent with the main Makefile |   28 # Those definitions should be consistent with the main Makefile | 
|   29 ANDROID_ARCHES = android_ia32 android_arm android_a64 android_mipsel |   29 ANDROID_ARCHES = android_ia32 android_arm android_arm64 android_mipsel | 
|   30 MODES = release debug |   30 MODES = release debug | 
|   31  |   31  | 
|   32 # Generates all combinations of ANDROID ARCHES and MODES, |   32 # Generates all combinations of ANDROID ARCHES and MODES, | 
|   33 # e.g. "android_ia32.release" or "android_arm.release" |   33 # e.g. "android_ia32.release" or "android_arm.release" | 
|   34 ANDROID_BUILDS = $(foreach mode,$(MODES), \ |   34 ANDROID_BUILDS = $(foreach mode,$(MODES), \ | 
|   35                    $(addsuffix .$(mode),$(ANDROID_ARCHES))) |   35                    $(addsuffix .$(mode),$(ANDROID_ARCHES))) | 
|   36  |   36  | 
|   37 HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/') |   37 HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/') | 
|   38 ANDROID_NDK_HOST_ARCH ?= $(shell uname -m | sed -e 's/i[3456]86/x86/') |   38 ANDROID_NDK_HOST_ARCH ?= $(shell uname -m | sed -e 's/i[3456]86/x86/') | 
|   39 ifeq ($(HOST_OS), linux) |   39 ifeq ($(HOST_OS), linux) | 
|   40   TOOLCHAIN_DIR = linux-$(ANDROID_NDK_HOST_ARCH) |   40   TOOLCHAIN_DIR = linux-$(ANDROID_NDK_HOST_ARCH) | 
|   41 else |   41 else | 
|   42   ifeq ($(HOST_OS), mac) |   42   ifeq ($(HOST_OS), mac) | 
|   43     TOOLCHAIN_DIR = darwin-$(ANDROID_NDK_HOST_ARCH) |   43     TOOLCHAIN_DIR = darwin-$(ANDROID_NDK_HOST_ARCH) | 
|   44   else |   44   else | 
|   45     $(error Host platform "${HOST_OS}" is not supported) |   45     $(error Host platform "${HOST_OS}" is not supported) | 
|   46   endif |   46   endif | 
|   47 endif |   47 endif | 
|   48  |   48  | 
|   49 ifeq ($(ARCH), android_arm) |   49 ifeq ($(ARCH), android_arm) | 
|   50   DEFINES  = target_arch=arm v8_target_arch=arm android_target_arch=arm |   50   DEFINES  = target_arch=arm v8_target_arch=arm android_target_arch=arm | 
|   51   DEFINES += arm_neon=0 arm_version=7 |   51   DEFINES += arm_neon=0 arm_version=7 | 
|   52   TOOLCHAIN_ARCH = arm-linux-androideabi |   52   TOOLCHAIN_ARCH = arm-linux-androideabi | 
|   53   TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) |   53   TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) | 
|   54   TOOLCHAIN_VER = 4.6 |   54   TOOLCHAIN_VER = 4.6 | 
|   55 else |   55 else | 
|   56   ifeq ($(ARCH), android_a64) |   56   ifeq ($(ARCH), android_arm64) | 
|   57     DEFINES  = target_arch=a64 v8_target_arch=a64 android_target_arch=arm64 |   57     DEFINES  = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 | 
|   58     TOOLCHAIN_ARCH = aarch64-linux-android |   58     TOOLCHAIN_ARCH = aarch64-linux-android | 
|   59     TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) |   59     TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) | 
|   60     TOOLCHAIN_VER = 4.8 |   60     TOOLCHAIN_VER = 4.8 | 
|   61   else |   61   else | 
|   62     ifeq ($(ARCH), android_mipsel) |   62     ifeq ($(ARCH), android_mipsel) | 
|   63       DEFINES  = target_arch=mipsel v8_target_arch=mipsel |   63       DEFINES  = target_arch=mipsel v8_target_arch=mipsel | 
|   64       DEFINES += android_target_arch=mips mips_arch_variant=mips32r2 |   64       DEFINES += android_target_arch=mips mips_arch_variant=mips32r2 | 
|   65       TOOLCHAIN_ARCH = mipsel-linux-android |   65       TOOLCHAIN_ARCH = mipsel-linux-android | 
|   66       TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) |   66       TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) | 
|   67       TOOLCHAIN_VER = 4.6 |   67       TOOLCHAIN_VER = 4.6 | 
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  109 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) |  109 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) | 
|  110 $(ANDROID_MAKEFILES): |  110 $(ANDROID_MAKEFILES): | 
|  111         GYP_GENERATORS=make-android \ |  111         GYP_GENERATORS=make-android \ | 
|  112         GYP_DEFINES="${DEFINES}" \ |  112         GYP_DEFINES="${DEFINES}" \ | 
|  113         CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \ |  113         CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \ | 
|  114         CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \ |  114         CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \ | 
|  115         PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \ |  115         PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \ | 
|  116         build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ |  116         build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ | 
|  117                       -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ |  117                       -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ | 
|  118                       -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} |  118                       -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} | 
| OLD | NEW |