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

Side by Side Diff: Makefile.android

Issue 233163003: Fix android_arm64 target for experimental ndk (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 8 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 | 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
(...skipping 29 matching lines...) Expand all
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 android_ target_platform=9
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_arm64) 56 ifeq ($(ARCH), android_arm64)
57 DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 57 DEFINES = target_arch=arm64 v8_target_arch=arm64 android_target_arch=arm64 android_target_platform=20
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 android_target_platfor m=9
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
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 71 DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 a ndroid_target_platform=9
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.6
75 else 75 else
76 $(error Target architecture "${ARCH}" is not supported) 76 $(error Target architecture "${ARCH}" is not supported)
77 endif 77 endif
78 endif 78 endif
79 endif 79 endif
80 endif 80 endif
81 81
(...skipping 27 matching lines...) Expand all
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}
OLDNEW
« no previous file with comments | « no previous file | build/android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698