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

Side by Side Diff: gypfiles/standalone.gypi

Issue 2286163002: Revert of Fix compiler warnings on "make android_arm" (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | src/compiler/js-operator.h » ('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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 }, 371 },
372 372
373 # Copy conditionally-set variables out one scope. 373 # Copy conditionally-set variables out one scope.
374 'android_ndk_version%': '<(android_ndk_version)', 374 'android_ndk_version%': '<(android_ndk_version)',
375 'android_target_arch%': '<(android_target_arch)', 375 'android_target_arch%': '<(android_target_arch)',
376 'android_target_platform%': '<(android_target_platform)', 376 'android_target_platform%': '<(android_target_platform)',
377 'android_toolchain%': '<(android_toolchain)', 377 'android_toolchain%': '<(android_toolchain)',
378 'arm_version%': '<(arm_version)', 378 'arm_version%': '<(arm_version)',
379 'host_os%': '<(host_os)', 379 'host_os%': '<(host_os)',
380 380
381 # Print to stdout on Android.
382 'v8_android_log_stdout%': 1,
383
384 'conditions': [ 381 'conditions': [
385 ['android_ndk_root==""', { 382 ['android_ndk_root==""', {
386 'variables': { 383 'variables': {
387 'android_sysroot': '<(android_toolchain)/sysroot/', 384 'android_sysroot': '<(android_toolchain)/sysroot/',
388 'android_stl': '<(android_toolchain)/sources/cxx-stl/', 385 'android_stl': '<(android_toolchain)/sources/cxx-stl/',
389 }, 386 },
390 'conditions': [ 387 'conditions': [
391 ['target_arch=="x64"', { 388 ['target_arch=="x64"', {
392 'android_lib': '<(android_sysroot)/usr/lib64', 389 'android_lib': '<(android_sysroot)/usr/lib64',
393 }, { 390 }, {
(...skipping 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 '-fsanitize=cfi-vcall', 1506 '-fsanitize=cfi-vcall',
1510 '-fsanitize=cfi-derived-cast', 1507 '-fsanitize=cfi-derived-cast',
1511 '-fsanitize=cfi-unrelated-cast', 1508 '-fsanitize=cfi-unrelated-cast',
1512 ], 1509 ],
1513 }], 1510 }],
1514 ], 1511 ],
1515 }, 1512 },
1516 }], 1513 }],
1517 ], 1514 ],
1518 } 1515 }
OLDNEW
« no previous file with comments | « no previous file | src/compiler/js-operator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698