Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 2404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2415 '-Wl,-z,nocopyreloc', | 2415 '-Wl,-z,nocopyreloc', |
| 2416 # crtbegin_dynamic.o should be the last item in ldflags. | 2416 # crtbegin_dynamic.o should be the last item in ldflags. |
| 2417 '<(android_ndk_lib)/crtbegin_dynamic.o', | 2417 '<(android_ndk_lib)/crtbegin_dynamic.o', |
| 2418 ], | 2418 ], |
| 2419 'libraries': [ | 2419 'libraries': [ |
| 2420 # crtend_android.o needs to be the last item in libraries. | 2420 # crtend_android.o needs to be the last item in libraries. |
| 2421 # Do not add any libraries after this! | 2421 # Do not add any libraries after this! |
| 2422 '<(android_ndk_lib)/crtend_android.o', | 2422 '<(android_ndk_lib)/crtend_android.o', |
| 2423 ], | 2423 ], |
| 2424 }], | 2424 }], |
| 2425 ['_type=="shared_library"', { | 2425 ['_type=="shared_library" or _type=="loadable_module"', { |
|
John Grabowski
2012/04/19 18:55:27
Can you briefly tell me why we're using loadable_m
Ted C
2012/04/19 23:21:07
This was taken from downstream to make skia happy
| |
| 2426 'ldflags': [ | 2426 'ldflags': [ |
| 2427 '-Wl,-shared,-Bsymbolic', | 2427 '-Wl,-shared,-Bsymbolic', |
| 2428 # crtbegin_so.o should be the last item in ldflags. | |
| 2429 '<(android_ndk_lib)/crtbegin_so.o', | |
| 2430 ], | |
| 2431 'libraries': [ | |
| 2432 # crtend_so.o needs to be the last item in libraries. | |
| 2433 # Do not add any libraries after this! | |
| 2434 '<(android_ndk_lib)/crtend_so.o', | |
| 2428 ], | 2435 ], |
| 2429 }], | 2436 }], |
| 2430 ], | 2437 ], |
| 2431 }], | 2438 }], |
| 2432 # Settings for building host targets using the system toolchain. | 2439 # Settings for building host targets using the system toolchain. |
| 2433 ['_toolset=="host"', { | 2440 ['_toolset=="host"', { |
| 2434 'cflags!': [ | 2441 'cflags!': [ |
| 2435 # Due to issues in Clang build system, using ASan on 32-bit | 2442 # Due to issues in Clang build system, using ASan on 32-bit |
| 2436 # binaries on x86_64 host is problematic. | 2443 # binaries on x86_64 host is problematic. |
| 2437 # TODO(eugenis): re-enable. | 2444 # TODO(eugenis): re-enable. |
| (...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3009 # settings in target dicts. SYMROOT is a special case, because many other | 3016 # settings in target dicts. SYMROOT is a special case, because many other |
| 3010 # Xcode variables depend on it, including variables such as | 3017 # Xcode variables depend on it, including variables such as |
| 3011 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3018 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3012 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3019 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3013 # files to appear (when present) in the UI as actual files and not red | 3020 # files to appear (when present) in the UI as actual files and not red |
| 3014 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3021 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3015 # and therefore SYMROOT, needs to be set at the project level. | 3022 # and therefore SYMROOT, needs to be set at the project level. |
| 3016 'SYMROOT': '<(DEPTH)/xcodebuild', | 3023 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3017 }, | 3024 }, |
| 3018 } | 3025 } |
| OLD | NEW |