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 30 matching lines...) Expand all Loading... |
41 ifeq ($(HOST_OS), mac) | 41 ifeq ($(HOST_OS), mac) |
42 TOOLCHAIN_DIR = darwin-x86 | 42 TOOLCHAIN_DIR = darwin-x86 |
43 else | 43 else |
44 $(error Host platform "${HOST_OS}" is not supported) | 44 $(error Host platform "${HOST_OS}" is not supported) |
45 endif | 45 endif |
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 | 49 DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm |
50 DEFINES += arm_neon=0 armv7=1 | 50 DEFINES += arm_neon=0 armv7=1 |
51 TOOLCHAIN_ARCH = arm-linux-androideabi-4.4.3 | 51 TOOLCHAIN_ARCH = arm-linux-androideabi-4.6 |
52 else | 52 else |
53 ifeq ($(ARCH), android_ia32) | 53 ifeq ($(ARCH), android_ia32) |
54 DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 | 54 DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 |
55 TOOLCHAIN_ARCH = x86-4.4.3 | 55 TOOLCHAIN_ARCH = x86-4.6 |
56 else | 56 else |
57 $(error Target architecture "${ARCH}" is not supported) | 57 $(error Target architecture "${ARCH}" is not supported) |
58 endif | 58 endif |
59 endif | 59 endif |
60 | 60 |
61 TOOLCHAIN_PATH = ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_ARCH}/prebuilt | 61 TOOLCHAIN_PATH = ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_ARCH}/prebuilt |
62 ANDROID_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR} | 62 ANDROID_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR} |
63 ifeq ($(wildcard $(ANDROID_TOOLCHAIN)),) | 63 ifeq ($(wildcard $(ANDROID_TOOLCHAIN)),) |
64 $(error Cannot find Android toolchain in "${ANDROID_TOOLCHAIN}") | 64 $(error Cannot find Android toolchain in "${ANDROID_TOOLCHAIN}") |
65 endif | 65 endif |
(...skipping 17 matching lines...) Expand all Loading... |
83 # Android GYP file generation targets. | 83 # Android GYP file generation targets. |
84 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_ARCHES)) | 84 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_ARCHES)) |
85 $(ANDROID_MAKEFILES): | 85 $(ANDROID_MAKEFILES): |
86 @GYP_GENERATORS=make-android \ | 86 @GYP_GENERATORS=make-android \ |
87 GYP_DEFINES="${DEFINES}" \ | 87 GYP_DEFINES="${DEFINES}" \ |
88 CC="${ANDROID_TOOLCHAIN}/bin/*-gcc" \ | 88 CC="${ANDROID_TOOLCHAIN}/bin/*-gcc" \ |
89 CXX="${ANDROID_TOOLCHAIN}/bin/*-g++" \ | 89 CXX="${ANDROID_TOOLCHAIN}/bin/*-g++" \ |
90 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ | 90 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ |
91 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ | 91 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ |
92 -S.${ARCH} ${GYPFLAGS} | 92 -S.${ARCH} ${GYPFLAGS} |
OLD | NEW |