| 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 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 ANDROID_NDK_HOST_ARCH ?= $(shell uname -m | sed -e 's/i[3456]86/x86/') | 39 ANDROID_NDK_HOST_ARCH ?= $(shell uname -m | sed -e 's/i[3456]86/x86/') |
| 40 ifeq ($(HOST_OS), linux) | 40 ifeq ($(HOST_OS), linux) |
| 41 TOOLCHAIN_DIR = linux-$(ANDROID_NDK_HOST_ARCH) | 41 TOOLCHAIN_DIR = linux-$(ANDROID_NDK_HOST_ARCH) |
| 42 else ifeq ($(HOST_OS), mac) | 42 else 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 | 47 |
| 48 ifeq ($(ARCH), android_arm) | 48 ifeq ($(ARCH), android_arm) |
| 49 DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm android_
target_platform=14 | 49 DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm android_
target_platform=21 |
| 50 DEFINES += arm_neon=0 arm_version=7 | 50 DEFINES += arm_neon=0 arm_version=7 |
| 51 TOOLCHAIN_ARCH = arm-linux-androideabi | 51 TOOLCHAIN_ARCH = arm-linux-androideabi |
| 52 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) | 52 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) |
| 53 TOOLCHAIN_VER = 4.8 | 53 TOOLCHAIN_VER = 4.8 |
| 54 else ifeq ($(ARCH), android_arm64) | 54 else ifeq ($(ARCH), android_arm64) |
| 55 DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 an
droid_target_platform=21 | 55 DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 an
droid_target_platform=21 |
| 56 TOOLCHAIN_ARCH = aarch64-linux-android | 56 TOOLCHAIN_ARCH = aarch64-linux-android |
| 57 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) | 57 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) |
| 58 TOOLCHAIN_VER = 4.9 | 58 TOOLCHAIN_VER = 4.9 |
| 59 else ifeq ($(ARCH), android_mipsel) | 59 else ifeq ($(ARCH), android_mipsel) |
| 60 DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_platform=14 | 60 DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_platform=21 |
| 61 DEFINES += android_target_arch=mips mips_arch_variant=mips32r2 | 61 DEFINES += android_target_arch=mips mips_arch_variant=mips32r2 |
| 62 TOOLCHAIN_ARCH = mipsel-linux-android | 62 TOOLCHAIN_ARCH = mipsel-linux-android |
| 63 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) | 63 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) |
| 64 TOOLCHAIN_VER = 4.8 | 64 TOOLCHAIN_VER = 4.8 |
| 65 else ifeq ($(ARCH), android_ia32) | 65 else ifeq ($(ARCH), android_ia32) |
| 66 DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 android
_target_platform=14 | 66 DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 android
_target_platform=21 |
| 67 TOOLCHAIN_ARCH = x86 | 67 TOOLCHAIN_ARCH = x86 |
| 68 TOOLCHAIN_PREFIX = i686-linux-android | 68 TOOLCHAIN_PREFIX = i686-linux-android |
| 69 TOOLCHAIN_VER = 4.8 | 69 TOOLCHAIN_VER = 4.8 |
| 70 else ifeq ($(ARCH), android_x64) | 70 else ifeq ($(ARCH), android_x64) |
| 71 DEFINES = target_arch=x64 v8_target_arch=x64 android_target_arch=x86_64 androi
d_target_platform=21 | 71 DEFINES = target_arch=x64 v8_target_arch=x64 android_target_arch=x86_64 androi
d_target_platform=21 |
| 72 TOOLCHAIN_ARCH = x86_64 | 72 TOOLCHAIN_ARCH = x86_64 |
| 73 TOOLCHAIN_PREFIX = x86_64-linux-android | 73 TOOLCHAIN_PREFIX = x86_64-linux-android |
| 74 TOOLCHAIN_VER = 4.9 | 74 TOOLCHAIN_VER = 4.9 |
| 75 else ifeq ($(ARCH), android_x87) | 75 else ifeq ($(ARCH), android_x87) |
| 76 DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86 android_t
arget_platform=14 | 76 DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86 android_t
arget_platform=21 |
| 77 TOOLCHAIN_ARCH = x86 | 77 TOOLCHAIN_ARCH = x86 |
| 78 TOOLCHAIN_PREFIX = i686-linux-android | 78 TOOLCHAIN_PREFIX = i686-linux-android |
| 79 TOOLCHAIN_VER = 4.8 | 79 TOOLCHAIN_VER = 4.8 |
| 80 else | 80 else |
| 81 $(error Target architecture "${ARCH}" is not supported) | 81 $(error Target architecture "${ARCH}" is not supported) |
| 82 endif | 82 endif |
| 83 | 83 |
| 84 TOOLCHAIN_PATH = \ | 84 TOOLCHAIN_PATH = \ |
| 85 ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_ARCH}-${TOOLCHAIN_VER}/prebuilt | 85 ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_ARCH}-${TOOLCHAIN_VER}/prebuilt |
| 86 ANDROID_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR} | 86 ANDROID_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR} |
| (...skipping 25 matching lines...) Expand all Loading... |
| 112 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) | 112 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) |
| 113 $(ANDROID_MAKEFILES): | 113 $(ANDROID_MAKEFILES): |
| 114 GYP_GENERATORS=make-android \ | 114 GYP_GENERATORS=make-android \ |
| 115 GYP_DEFINES="${DEFINES}" \ | 115 GYP_DEFINES="${DEFINES}" \ |
| 116 CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \ | 116 CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \ |
| 117 CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \ | 117 CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \ |
| 118 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:
$(PYTHONPATH)" \ | 118 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build:
$(PYTHONPATH)" \ |
| 119 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ | 119 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ |
| 120 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ | 120 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ |
| 121 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} | 121 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} |
| OLD | NEW |