| 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 4570 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4581               'CHROME_BUILD_ID="<(chrome_build_id)"', | 4581               'CHROME_BUILD_ID="<(chrome_build_id)"', | 
| 4582             ], | 4582             ], | 
| 4583             'ldflags!': [ | 4583             'ldflags!': [ | 
| 4584               '-pthread',  # Not supported by Android toolchain. | 4584               '-pthread',  # Not supported by Android toolchain. | 
| 4585             ], | 4585             ], | 
| 4586             'ldflags': [ | 4586             'ldflags': [ | 
| 4587               '-Wl,--no-undefined', | 4587               '-Wl,--no-undefined', | 
| 4588             ], | 4588             ], | 
| 4589             'conditions': [ | 4589             'conditions': [ | 
| 4590               ['component=="static_library" and android_webview_build==0', { | 4590               ['component=="static_library" and android_webview_build==0', { | 
| 4591                 'ldflags': [ |  | 
| 4592                   '-Wl,--exclude-libs=ALL', |  | 
| 4593                 ], |  | 
| 4594                 'target_conditions': [ | 4591                 'target_conditions': [ | 
| 4595                   ['use_native_jni_exports==0', { | 4592                   ['use_native_jni_exports==0', { | 
| 4596                     # Use a linker version script to strip JNI exports from | 4593                     # Use a linker version script to strip JNI exports from | 
| 4597                     # binaries which have not specifically asked to use them. | 4594                     # binaries which have not specifically asked to use them. | 
| 4598                     'ldflags': [ | 4595                     'ldflags': [ | 
| 4599                       '-Wl,--version-script=<!(cd <(DEPTH) && pwd -P)/build/andr
      oid/android_no_jni_exports.lst', | 4596                       '-Wl,--version-script=<!(cd <(DEPTH) && pwd -P)/build/andr
      oid/android_no_jni_exports.lst', | 
| 4600                     ], | 4597                     ], | 
| 4601                   }], | 4598                   }], | 
| 4602                 ], | 4599                 ], | 
| 4603               }], | 4600               }], | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4651                   # The NDK has these things, but doesn't define the constants | 4648                   # The NDK has these things, but doesn't define the constants | 
| 4652                   # to say that it does. Define them here instead. | 4649                   # to say that it does. Define them here instead. | 
| 4653                   'HAVE_SYS_UIO_H', | 4650                   'HAVE_SYS_UIO_H', | 
| 4654                 ], | 4651                 ], | 
| 4655                 'cflags': [ | 4652                 'cflags': [ | 
| 4656                   '--sysroot=<(android_ndk_sysroot)', | 4653                   '--sysroot=<(android_ndk_sysroot)', | 
| 4657                 ], | 4654                 ], | 
| 4658                 'ldflags': [ | 4655                 'ldflags': [ | 
| 4659                   '--sysroot=<(android_ndk_sysroot)', | 4656                   '--sysroot=<(android_ndk_sysroot)', | 
| 4660                   '-nostdlib', | 4657                   '-nostdlib', | 
|  | 4658                   # Don't allow visible symbols from libgcc or stlport to be | 
|  | 4659                   # re-exported. | 
|  | 4660                   '-Wl,--exclude-libs=libgcc.a', | 
|  | 4661                   '-Wl,--exclude-libs=libstlport_static.a', | 
|  | 4662                   # Don't allow visible symbols from libraries that contain | 
|  | 4663                   # assembly code with symbols that aren't hidden properly. | 
|  | 4664                   # http://crbug.com/448386 | 
|  | 4665                   '-Wl,--exclude-libs=libcommon_audio.a', | 
|  | 4666                   '-Wl,--exclude-libs=libcommon_audio_neon.a', | 
|  | 4667                   '-Wl,--exclude-libs=libcommon_audio_sse2.a', | 
|  | 4668                   '-Wl,--exclude-libs=libiSACFix.a', | 
|  | 4669                   '-Wl,--exclude-libs=libisac_neon.a', | 
|  | 4670                   '-Wl,--exclude-libs=libopus.a', | 
|  | 4671                   '-Wl,--exclude-libs=libvpx.a', | 
| 4661                 ], | 4672                 ], | 
| 4662                 'libraries': [ | 4673                 'libraries': [ | 
| 4663                   '-l<(android_stlport_library)', | 4674                   '-l<(android_stlport_library)', | 
| 4664                   # Manually link the libgcc.a that the cross compiler uses. | 4675                   # Manually link the libgcc.a that the cross compiler uses. | 
| 4665                   '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)', | 4676                   '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)', | 
| 4666                   '-lc', | 4677                   '-lc', | 
| 4667                   '-ldl', | 4678                   '-ldl', | 
| 4668                   '-lm', | 4679                   '-lm', | 
| 4669                 ], | 4680                 ], | 
| 4670               }], | 4681               }], | 
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4767                   # crtbegin_dynamic.o should be the last item in ldflags. | 4778                   # crtbegin_dynamic.o should be the last item in ldflags. | 
| 4768                   '<(android_ndk_lib)/crtbegin_dynamic.o', | 4779                   '<(android_ndk_lib)/crtbegin_dynamic.o', | 
| 4769                 ], | 4780                 ], | 
| 4770                 'libraries': [ | 4781                 'libraries': [ | 
| 4771                   # crtend_android.o needs to be the last item in libraries. | 4782                   # crtend_android.o needs to be the last item in libraries. | 
| 4772                   # Do not add any libraries after this! | 4783                   # Do not add any libraries after this! | 
| 4773                   '<(android_ndk_lib)/crtend_android.o', | 4784                   '<(android_ndk_lib)/crtend_android.o', | 
| 4774                 ], | 4785                 ], | 
| 4775               }], | 4786               }], | 
| 4776               ['_type=="shared_library" or _type=="loadable_module"', { | 4787               ['_type=="shared_library" or _type=="loadable_module"', { | 
| 4777                 'ldflags!': [ |  | 
| 4778                   '-Wl,--exclude-libs=ALL', |  | 
| 4779                 ], |  | 
| 4780                 'ldflags': [ | 4788                 'ldflags': [ | 
| 4781                   '-Wl,-shared,-Bsymbolic', | 4789                   '-Wl,-shared,-Bsymbolic', | 
| 4782                 ], | 4790                 ], | 
| 4783                 'conditions': [ | 4791                 'conditions': [ | 
| 4784                   ['android_webview_build==0', { | 4792                   ['android_webview_build==0', { | 
| 4785                     'ldflags': [ | 4793                     'ldflags': [ | 
| 4786                       # crtbegin_so.o should be the last item in ldflags. | 4794                       # crtbegin_so.o should be the last item in ldflags. | 
| 4787                       '<(android_ndk_lib)/crtbegin_so.o', | 4795                       '<(android_ndk_lib)/crtbegin_so.o', | 
| 4788                     ], | 4796                     ], | 
| 4789                     'libraries': [ | 4797                     'libraries': [ | 
| (...skipping 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5910     # settings in target dicts.  SYMROOT is a special case, because many other | 5918     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 5911     # Xcode variables depend on it, including variables such as | 5919     # Xcode variables depend on it, including variables such as | 
| 5912     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 5920     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 5913     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5921     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 5914     # files to appear (when present) in the UI as actual files and not red | 5922     # files to appear (when present) in the UI as actual files and not red | 
| 5915     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5923     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 5916     # and therefore SYMROOT, needs to be set at the project level. | 5924     # and therefore SYMROOT, needs to be set at the project level. | 
| 5917     'SYMROOT': '<(DEPTH)/xcodebuild', | 5925     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 5918   }, | 5926   }, | 
| 5919 } | 5927 } | 
| OLD | NEW | 
|---|