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

Side by Side Diff: Makefile.android

Issue 440663002: Enable C++11. Synch toolchains with Chrome. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Disabled test on VisualStudio for now. 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 | 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 android_ target_platform=14 50 DEFINES = target_arch=arm v8_target_arch=arm android_target_arch=arm android_ target_platform=14
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.8
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 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
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 | build/android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698