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

Side by Side Diff: build/common.gypi

Issue 147533004: Remove unneeded JNI registrations. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Fix exports in non-JNI shared libs. Created 6 years, 6 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 | « build/android/android_exports.lst ('k') | build/jar_file_jni_generator.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 (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 1713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 # When building as part of the Android system, use system libraries 1724 # When building as part of the Android system, use system libraries
1725 # where possible to reduce ROM size. 1725 # where possible to reduce ROM size.
1726 # TODO(steveblock): Investigate using the system version of sqlite. 1726 # TODO(steveblock): Investigate using the system version of sqlite.
1727 'use_system_sqlite%': 0, # '<(android_webview_build)', 1727 'use_system_sqlite%': 0, # '<(android_webview_build)',
1728 'use_system_expat%': '<(android_webview_build)', 1728 'use_system_expat%': '<(android_webview_build)',
1729 'use_system_icu%': '<(android_webview_build)', 1729 'use_system_icu%': '<(android_webview_build)',
1730 'use_system_stlport%': '<(android_webview_build)', 1730 'use_system_stlport%': '<(android_webview_build)',
1731 1731
1732 # Copy it out one scope. 1732 # Copy it out one scope.
1733 'android_webview_build%': '<(android_webview_build)', 1733 'android_webview_build%': '<(android_webview_build)',
1734
1735 # Default android linker script for shared library exports.
1736 'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_exports.ls t',
1734 }], # OS=="android" 1737 }], # OS=="android"
1735 ['android_webview_build==1', { 1738 ['android_webview_build==1', {
1736 # When building the WebView in the Android tree, jarjar will remap all 1739 # When building the WebView in the Android tree, jarjar will remap all
1737 # the class names, so the JNI generator needs to know this. 1740 # the class names, so the JNI generator needs to know this.
1738 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' , 1741 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' ,
1739 }], 1742 }],
1740 ['OS=="mac"', { 1743 ['OS=="mac"', {
1741 'conditions': [ 1744 'conditions': [
1742 # All Chrome builds have breakpad symbols, but only process the 1745 # All Chrome builds have breakpad symbols, but only process the
1743 # symbols from official builds. 1746 # symbols from official builds.
(...skipping 2399 matching lines...) Expand 10 before | Expand all | Expand 10 after
4143 # versions with the same name (e.g. skia, icu). 4146 # versions with the same name (e.g. skia, icu).
4144 ['component=="shared_library"', { 4147 ['component=="shared_library"', {
4145 'android_product_extension': 'cr.so', 4148 'android_product_extension': 'cr.so',
4146 }, { 4149 }, {
4147 'android_product_extension': 'so', 4150 'android_product_extension': 'so',
4148 } ], 4151 } ],
4149 ], 4152 ],
4150 }, 4153 },
4151 'target_conditions': [ 4154 'target_conditions': [
4152 ['_type=="shared_library"', { 4155 ['_type=="shared_library"', {
4153 'product_extension': '<(android_product_extension)', 4156 'product_extension': '<(android_product_extension)',
4154 }], 4157 }],
4155 4158
4156 # Settings for building device targets using Android's toolchain. 4159 # Settings for building device targets using Android's toolchain.
4157 # These are based on the setup.mk file from the Android NDK. 4160 # These are based on the setup.mk file from the Android NDK.
4158 # 4161 #
4159 # The NDK Android executable link step looks as follows: 4162 # The NDK Android executable link step looks as follows:
4160 # $LDFLAGS 4163 # $LDFLAGS
4161 # $(TARGET_CRTBEGIN_DYNAMIC_O) <-- crtbegin.o 4164 # $(TARGET_CRTBEGIN_DYNAMIC_O) <-- crtbegin.o
4162 # $(PRIVATE_OBJECTS) <-- The .o that we built 4165 # $(PRIVATE_OBJECTS) <-- The .o that we built
4163 # $(PRIVATE_STATIC_LIBRARIES) <-- The .a that we built 4166 # $(PRIVATE_STATIC_LIBRARIES) <-- The .a that we built
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
4209 'USE_STLPORT=1', 4212 'USE_STLPORT=1',
4210 '_STLP_USE_PTR_SPECIALIZATIONS=1', 4213 '_STLP_USE_PTR_SPECIALIZATIONS=1',
4211 'CHROME_BUILD_ID="<(chrome_build_id)"', 4214 'CHROME_BUILD_ID="<(chrome_build_id)"',
4212 ], 4215 ],
4213 'ldflags!': [ 4216 'ldflags!': [
4214 '-pthread', # Not supported by Android toolchain. 4217 '-pthread', # Not supported by Android toolchain.
4215 ], 4218 ],
4216 'ldflags': [ 4219 'ldflags': [
4217 '-nostdlib', 4220 '-nostdlib',
4218 '-Wl,--no-undefined', 4221 '-Wl,--no-undefined',
4219 # Don't export symbols from statically linked libraries.
4220 '-Wl,--exclude-libs=ALL',
4221 ], 4222 ],
4222 'libraries': [ 4223 'libraries': [
4223 '-l<(android_stlport_library)', 4224 '-l<(android_stlport_library)',
4224 # Manually link the libgcc.a that the cross compiler uses. 4225 # Manually link the libgcc.a that the cross compiler uses.
4225 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)', 4226 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)',
4226 '-lc', 4227 '-lc',
4227 '-ldl', 4228 '-ldl',
4228 '-lm', 4229 '-lm',
4229 ], 4230 ],
4230 'conditions': [ 4231 'conditions': [
4231 ['component=="shared_library"', { 4232 ['component=="static_library"', {
4232 'ldflags!': [ 4233 'ldflags': [
4233 '-Wl,--exclude-libs=ALL', 4234 '-Wl,--exclude-libs=ALL',
4234 ], 4235 ],
4235 }], 4236 }],
4236 ['clang==1', { 4237 ['clang==1', {
4237 'cflags': [ 4238 'cflags': [
4238 # Work around incompatibilities between bionic and clang 4239 # Work around incompatibilities between bionic and clang
4239 # headers. 4240 # headers.
4240 '-D__compiler_offsetof=__builtin_offsetof', 4241 '-D__compiler_offsetof=__builtin_offsetof',
4241 '-Dnan=__builtin_nan', 4242 '-Dnan=__builtin_nan',
4242 ], 4243 ],
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after
5429 # settings in target dicts. SYMROOT is a special case, because many other 5430 # settings in target dicts. SYMROOT is a special case, because many other
5430 # Xcode variables depend on it, including variables such as 5431 # Xcode variables depend on it, including variables such as
5431 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5432 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5432 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5433 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5433 # files to appear (when present) in the UI as actual files and not red 5434 # files to appear (when present) in the UI as actual files and not red
5434 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5435 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5435 # and therefore SYMROOT, needs to be set at the project level. 5436 # and therefore SYMROOT, needs to be set at the project level.
5436 'SYMROOT': '<(DEPTH)/xcodebuild', 5437 'SYMROOT': '<(DEPTH)/xcodebuild',
5437 }, 5438 },
5438 } 5439 }
OLDNEW
« no previous file with comments | « build/android/android_exports.lst ('k') | build/jar_file_jni_generator.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698