Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: Makefile.android

Issue 966773005: introduce android_x64 build target (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: linker issue Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Makefile ('k') | build/android.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_arm64 android_mipsel android_x 87 29 ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
30 » » android_mipsel android_x87
30 MODES = release debug 31 MODES = release debug
31 32
32 # Generates all combinations of ANDROID ARCHES and MODES, 33 # Generates all combinations of ANDROID ARCHES and MODES,
33 # e.g. "android_ia32.release" or "android_arm.release" 34 # e.g. "android_ia32.release" or "android_arm.release"
34 ANDROID_BUILDS = $(foreach mode,$(MODES), \ 35 ANDROID_BUILDS = $(foreach mode,$(MODES), \
35 $(addsuffix .$(mode),$(ANDROID_ARCHES))) 36 $(addsuffix .$(mode),$(ANDROID_ARCHES)))
36 37
37 HOST_OS = $(shell uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/') 38 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/') 39 ANDROID_NDK_HOST_ARCH ?= $(shell uname -m | sed -e 's/i[3456]86/x86/')
39 ifeq ($(HOST_OS), linux) 40 ifeq ($(HOST_OS), linux)
(...skipping 19 matching lines...) Expand all
59 DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_platform=14 60 DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_platform=14
60 DEFINES += android_target_arch=mips mips_arch_variant=mips32r2 61 DEFINES += android_target_arch=mips mips_arch_variant=mips32r2
61 TOOLCHAIN_ARCH = mipsel-linux-android 62 TOOLCHAIN_ARCH = mipsel-linux-android
62 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH) 63 TOOLCHAIN_PREFIX = $(TOOLCHAIN_ARCH)
63 TOOLCHAIN_VER = 4.8 64 TOOLCHAIN_VER = 4.8
64 else ifeq ($(ARCH), android_ia32) 65 else ifeq ($(ARCH), android_ia32)
65 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=14
66 TOOLCHAIN_ARCH = x86 67 TOOLCHAIN_ARCH = x86
67 TOOLCHAIN_PREFIX = i686-linux-android 68 TOOLCHAIN_PREFIX = i686-linux-android
68 TOOLCHAIN_VER = 4.8 69 TOOLCHAIN_VER = 4.8
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
72 TOOLCHAIN_ARCH = x86_64
73 TOOLCHAIN_PREFIX = x86_64-linux-android
74 TOOLCHAIN_VER = 4.9
69 else ifeq ($(ARCH), android_x87) 75 else ifeq ($(ARCH), android_x87)
70 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=14
71 TOOLCHAIN_ARCH = x86 77 TOOLCHAIN_ARCH = x86
72 TOOLCHAIN_PREFIX = i686-linux-android 78 TOOLCHAIN_PREFIX = i686-linux-android
73 TOOLCHAIN_VER = 4.8 79 TOOLCHAIN_VER = 4.8
74 else 80 else
75 $(error Target architecture "${ARCH}" is not supported) 81 $(error Target architecture "${ARCH}" is not supported)
76 endif 82 endif
77 83
78 TOOLCHAIN_PATH = \ 84 TOOLCHAIN_PATH = \
(...skipping 27 matching lines...) Expand all
106 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) 112 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS))
107 $(ANDROID_MAKEFILES): 113 $(ANDROID_MAKEFILES):
108 GYP_GENERATORS=make-android \ 114 GYP_GENERATORS=make-android \
109 GYP_DEFINES="${DEFINES}" \ 115 GYP_DEFINES="${DEFINES}" \
110 CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \ 116 CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \
111 CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \ 117 CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \
112 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build: $(PYTHONPATH)" \ 118 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build: $(PYTHONPATH)" \
113 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ 119 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
114 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ 120 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
115 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} 121 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS}
OLDNEW
« no previous file with comments | « Makefile ('k') | build/android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698