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

Side by Side Diff: Makefile.android

Issue 486173002: Update toolchain for Android mipsel, ia32, x87. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=L 57 DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=L
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.9 60 TOOLCHAIN_VER = 4.9
61 else 61 else
62 ifeq ($(ARCH), android_mipsel) 62 ifeq ($(ARCH), android_mipsel)
63 DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_platfor m=14 63 DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_platfor m=14
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.8
68 68
69 else 69 else
70 ifeq ($(ARCH), android_ia32) 70 ifeq ($(ARCH), android_ia32)
71 DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 a ndroid_target_platform=14 71 DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 a ndroid_target_platform=14
72 TOOLCHAIN_ARCH = x86 72 TOOLCHAIN_ARCH = x86
73 TOOLCHAIN_PREFIX = i686-linux-android 73 TOOLCHAIN_PREFIX = i686-linux-android
74 TOOLCHAIN_VER = 4.6 74 TOOLCHAIN_VER = 4.8
75 else 75 else
76 ifeq ($(ARCH), android_x87) 76 ifeq ($(ARCH), android_x87)
77 DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86 a ndroid_target_platform=14 77 DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86 a ndroid_target_platform=14
78 TOOLCHAIN_ARCH = x86 78 TOOLCHAIN_ARCH = x86
79 TOOLCHAIN_PREFIX = i686-linux-android 79 TOOLCHAIN_PREFIX = i686-linux-android
80 TOOLCHAIN_VER = 4.6 80 TOOLCHAIN_VER = 4.8
81 else 81 else
82 $(error Target architecture "${ARCH}" is not supported) 82 $(error Target architecture "${ARCH}" is not supported)
83 endif 83 endif
84 endif 84 endif
85 endif 85 endif
86 endif 86 endif
87 endif 87 endif
88 88
89 TOOLCHAIN_PATH = \ 89 TOOLCHAIN_PATH = \
90 ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_ARCH}-${TOOLCHAIN_VER}/prebuilt 90 ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_ARCH}-${TOOLCHAIN_VER}/prebuilt
(...skipping 26 matching lines...) Expand all
117 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS)) 117 ANDROID_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ANDROID_BUILDS))
118 $(ANDROID_MAKEFILES): 118 $(ANDROID_MAKEFILES):
119 GYP_GENERATORS=make-android \ 119 GYP_GENERATORS=make-android \
120 GYP_DEFINES="${DEFINES}" \ 120 GYP_DEFINES="${DEFINES}" \
121 CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \ 121 CC="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-gcc" \
122 CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \ 122 CXX="${ANDROID_TOOLCHAIN}/bin/${TOOLCHAIN_PREFIX}-g++" \
123 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build: $(PYTHONPATH)" \ 123 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build: $(PYTHONPATH)" \
124 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ 124 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
125 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \ 125 -Ibuild/standalone.gypi --depth=. -Ibuild/android.gypi \
126 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS} 126 -S$(suffix $(basename $@))$(suffix $@) ${GYPFLAGS}
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698