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

Side by Side Diff: build/standalone.gypi

Issue 1413693009: [mac] Fix cross-compilation for Android from a Mac Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 1 month 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
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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 }], 246 }],
247 ['OS=="android"', { 247 ['OS=="android"', {
248 # Location of Android NDK. 248 # Location of Android NDK.
249 'variables': { 249 'variables': {
250 'variables': { 250 'variables': {
251 # The Android toolchain needs to use the absolute path to the NDK 251 # The Android toolchain needs to use the absolute path to the NDK
252 # because it is used at different levels in the GYP files. 252 # because it is used at different levels in the GYP files.
253 'android_ndk_root%': '<(base_dir)/third_party/android_tools/ndk/', 253 'android_ndk_root%': '<(base_dir)/third_party/android_tools/ndk/',
254 'android_host_arch%': "<!(uname -m | sed -e 's/i[3456]86/x86/')", 254 'android_host_arch%': "<!(uname -m | sed -e 's/i[3456]86/x86/')",
255 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 255 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
256 'os_folder_name%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/da rwin/')",
256 }, 257 },
257 258
258 # Copy conditionally-set variables out one scope. 259 # Copy conditionally-set variables out one scope.
259 'android_ndk_root%': '<(android_ndk_root)', 260 'android_ndk_root%': '<(android_ndk_root)',
260 'host_os%': '<(host_os)', 261 'host_os%': '<(host_os)',
262 'os_folder_name%': '<(os_folder_name)',
261 263
262 'conditions': [ 264 'conditions': [
263 ['target_arch == "ia32"', { 265 ['target_arch == "ia32"', {
264 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.9/preb uilt/<(host_os)-<(android_host_arch)/bin', 266 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.9/preb uilt/<(os_folder_name)-<(android_host_arch)/bin',
265 'android_target_arch%': 'x86', 267 'android_target_arch%': 'x86',
266 'android_target_platform%': '16', 268 'android_target_platform%': '16',
269 'arm_version%': 'default',
267 }], 270 }],
268 ['target_arch == "x64"', { 271 ['target_arch == "x64"', {
269 'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/p rebuilt/<(host_os)-<(android_host_arch)/bin', 272 'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/p rebuilt/<(os_folder_name)-<(android_host_arch)/bin',
270 'android_target_arch%': 'x86_64', 273 'android_target_arch%': 'x86_64',
271 'android_target_platform%': '21', 274 'android_target_platform%': '21',
275 'arm_version%': 'default',
272 }], 276 }],
273 ['target_arch=="arm"', { 277 ['target_arch=="arm"', {
274 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 278 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an droideabi-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
275 'android_target_arch%': 'arm', 279 'android_target_arch%': 'arm',
276 'android_target_platform%': '16', 280 'android_target_platform%': '16',
277 'arm_version%': 7, 281 'arm_version%': 7,
278 }], 282 }],
279 ['target_arch == "arm64"', { 283 ['target_arch == "arm64"', {
280 'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linu x-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 284 'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linu x-android-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
281 'android_target_arch%': 'arm64', 285 'android_target_arch%': 'arm64',
282 'android_target_platform%': '21', 286 'android_target_platform%': '21',
283 'arm_version%': 'default', 287 'arm_version%': 'default',
284 }], 288 }],
285 ['target_arch == "mipsel"', { 289 ['target_arch == "mipsel"', {
286 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 290 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux -android-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
287 'android_target_arch%': 'mips', 291 'android_target_arch%': 'mips',
288 'android_target_platform%': '16', 292 'android_target_platform%': '16',
293 'arm_version%': 'default',
289 }], 294 }],
290 ['target_arch == "mips64el"', { 295 ['target_arch == "mips64el"', {
291 'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-lin ux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', 296 'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-lin ux-android-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin',
292 'android_target_arch%': 'mips64', 297 'android_target_arch%': 'mips64',
293 'android_target_platform%': '21', 298 'android_target_platform%': '21',
299 'arm_version%': 'default',
294 }], 300 }],
295 ], 301 ],
296 }, 302 },
297 303
298 # Copy conditionally-set variables out one scope. 304 # Copy conditionally-set variables out one scope.
299 'android_target_arch%': '<(android_target_arch)', 305 'android_target_arch%': '<(android_target_arch)',
300 'android_target_platform%': '<(android_target_platform)', 306 'android_target_platform%': '<(android_target_platform)',
301 'android_toolchain%': '<(android_toolchain)', 307 'android_toolchain%': '<(android_toolchain)',
302 'arm_version%': '<(arm_version)', 308 'arm_version%': '<(arm_version)',
303 'host_os%': '<(host_os)', 309 'host_os%': '<(host_os)',
(...skipping 27 matching lines...) Expand all
331 'android_lib': '<(android_sysroot)/usr/lib', 337 'android_lib': '<(android_sysroot)/usr/lib',
332 }], 338 }],
333 ], 339 ],
334 'android_stlport_include': '<(android_stlport)/stlport', 340 'android_stlport_include': '<(android_stlport)/stlport',
335 'android_stlport_libs': '<(android_stlport)/libs', 341 'android_stlport_libs': '<(android_stlport)/libs',
336 }], 342 }],
337 ], 343 ],
338 'android_stlport_library': 'stlport_static', 344 'android_stlport_library': 'stlport_static',
339 }], # OS=="android" 345 }], # OS=="android"
340 ['host_clang==1', { 346 ['host_clang==1', {
347 'host_ld': '<!(which ld)',
Jakob Kummerow 2015/10/30 11:57:25 Yeah, this can't be in an OS-independent section.
348 'host_ranlib': '<!(which ranlib)',
341 'host_cc': '<(clang_dir)/bin/clang', 349 'host_cc': '<(clang_dir)/bin/clang',
342 'host_cxx': '<(clang_dir)/bin/clang++', 350 'host_cxx': '<(clang_dir)/bin/clang++',
343 }, { 351 }, {
352 'host_ld': '<!(which ld)',
Jakob Kummerow 2015/10/30 11:57:25 Also, having the same stuff in both branches of a
353 'host_ranlib': '<!(which ranlib)',
344 'host_cc': '<!(which gcc)', 354 'host_cc': '<!(which gcc)',
345 'host_cxx': '<!(which g++)', 355 'host_cxx': '<!(which g++)',
346 }], 356 }],
347 ], 357 ],
348 # Default ARM variable settings. 358 # Default ARM variable settings.
349 'arm_version%': 'default', 359 'arm_version%': 'default',
350 'arm_fpu%': 'vfpv3', 360 'arm_fpu%': 'vfpv3',
351 'arm_float_abi%': 'default', 361 'arm_float_abi%': 'default',
352 'arm_thumb': 'default', 362 'arm_thumb': 'default',
353 363
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 '-Wl,--as-needed', 1145 '-Wl,--as-needed',
1136 ], 1146 ],
1137 }], 1147 }],
1138 ], # target_conditions 1148 ], # target_conditions
1139 }, # target_defaults 1149 }, # target_defaults
1140 }], # OS=="android" 1150 }], # OS=="android"
1141 ['OS=="android" and clang==0', { 1151 ['OS=="android" and clang==0', {
1142 # Hardcode the compiler names in the Makefile so that 1152 # Hardcode the compiler names in the Makefile so that
1143 # it won't depend on the environment at make time. 1153 # it won't depend on the environment at make time.
1144 'make_global_settings': [ 1154 'make_global_settings': [
1155 ['LD', '<!(/bin/echo -n <(android_toolchain)/../*/bin/ld)'],
1156 ['RANLIB', '<!(/bin/echo -n <(android_toolchain)/../*/bin/ranlib)'],
1145 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'], 1157 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'],
1146 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'], 1158 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'],
1159 ['LD.host', '<(host_ld)'],
1160 ['RANLIB.host', '<(host_ranlib)'],
1147 ['CC.host', '<(host_cc)'], 1161 ['CC.host', '<(host_cc)'],
Michael Achenbach 2015/10/27 14:47:54 Not sure if I understand the test in https://chrom
1148 ['CXX.host', '<(host_cxx)'], 1162 ['CXX.host', '<(host_cxx)'],
1149 ], 1163 ],
1150 }], 1164 }],
1151 ['clang!=1 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"' , { 1165 ['clang!=1 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"' , {
1152 'make_global_settings': [ 1166 'make_global_settings': [
1153 ['CC.host', '<(clang_dir)/bin/clang'], 1167 ['CC.host', '<(clang_dir)/bin/clang'],
1154 ['CXX.host', '<(clang_dir)/bin/clang++'], 1168 ['CXX.host', '<(clang_dir)/bin/clang++'],
1155 ], 1169 ],
1156 }], 1170 }],
1157 ['clang==0 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"' , { 1171 ['clang==0 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"' , {
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 '-fsanitize=cfi-vcall', 1319 '-fsanitize=cfi-vcall',
1306 '-fsanitize=cfi-derived-cast', 1320 '-fsanitize=cfi-derived-cast',
1307 '-fsanitize=cfi-unrelated-cast', 1321 '-fsanitize=cfi-unrelated-cast',
1308 ], 1322 ],
1309 }], 1323 }],
1310 ], 1324 ],
1311 }, 1325 },
1312 }], 1326 }],
1313 ], 1327 ],
1314 } 1328 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698