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

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: Updated by review comments. Created 6 years, 8 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
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 1610 matching lines...) Expand 10 before | Expand all | Expand 10 after
1621 # When building as part of the Android system, use system libraries 1621 # When building as part of the Android system, use system libraries
1622 # where possible to reduce ROM size. 1622 # where possible to reduce ROM size.
1623 # TODO(steveblock): Investigate using the system version of sqlite. 1623 # TODO(steveblock): Investigate using the system version of sqlite.
1624 'use_system_sqlite%': 0, # '<(android_webview_build)', 1624 'use_system_sqlite%': 0, # '<(android_webview_build)',
1625 'use_system_expat%': '<(android_webview_build)', 1625 'use_system_expat%': '<(android_webview_build)',
1626 'use_system_icu%': '<(android_webview_build)', 1626 'use_system_icu%': '<(android_webview_build)',
1627 'use_system_stlport%': '<(android_webview_build)', 1627 'use_system_stlport%': '<(android_webview_build)',
1628 1628
1629 # Copy it out one scope. 1629 # Copy it out one scope.
1630 'android_webview_build%': '<(android_webview_build)', 1630 'android_webview_build%': '<(android_webview_build)',
1631
1632 # Default android linker script for shared library exports.
1633 'android_linker_script%': '<!(cd <(DEPTH) && pwd -P)/build/android/andro id_exports.lst',
Torne 2014/04/22 10:53:21 You mustn't use absolute paths here; for the webvi
ostap 2014/04/24 03:58:43 Done.
1631 }], # OS=="android" 1634 }], # OS=="android"
1632 ['android_webview_build==1', { 1635 ['android_webview_build==1', {
1633 # When building the WebView in the Android tree, jarjar will remap all 1636 # When building the WebView in the Android tree, jarjar will remap all
1634 # the class names, so the JNI generator needs to know this. 1637 # the class names, so the JNI generator needs to know this.
1635 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' , 1638 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' ,
1636 }], 1639 }],
1637 ['OS=="mac"', { 1640 ['OS=="mac"', {
1638 'conditions': [ 1641 'conditions': [
1639 # All Chrome builds have breakpad symbols, but only process the 1642 # All Chrome builds have breakpad symbols, but only process the
1640 # symbols from official builds. 1643 # symbols from official builds.
(...skipping 2329 matching lines...) Expand 10 before | Expand all | Expand 10 after
3970 'android_product_extension': 'cr.so', 3973 'android_product_extension': 'cr.so',
3971 }, { 3974 }, {
3972 'android_product_extension': 'so', 3975 'android_product_extension': 'so',
3973 } ], 3976 } ],
3974 ], 3977 ],
3975 }, 3978 },
3976 'target_conditions': [ 3979 'target_conditions': [
3977 ['_type=="shared_library"', { 3980 ['_type=="shared_library"', {
3978 'product_extension': '<(android_product_extension)', 3981 'product_extension': '<(android_product_extension)',
3979 }], 3982 }],
3983 ['_toolset=="target" and component=="static_library" and _type=="share d_library"', {
3984 'ldflags': [
3985 # Only export symbols that are specified in version script.
3986 '-Wl,--version-script="<(android_linker_script)"',
3987 ],
3988 }],
3980 3989
3981 # Settings for building device targets using Android's toolchain. 3990 # Settings for building device targets using Android's toolchain.
3982 # These are based on the setup.mk file from the Android NDK. 3991 # These are based on the setup.mk file from the Android NDK.
3983 # 3992 #
3984 # The NDK Android executable link step looks as follows: 3993 # The NDK Android executable link step looks as follows:
3985 # $LDFLAGS 3994 # $LDFLAGS
3986 # $(TARGET_CRTBEGIN_DYNAMIC_O) <-- crtbegin.o 3995 # $(TARGET_CRTBEGIN_DYNAMIC_O) <-- crtbegin.o
3987 # $(PRIVATE_OBJECTS) <-- The .o that we built 3996 # $(PRIVATE_OBJECTS) <-- The .o that we built
3988 # $(PRIVATE_STATIC_LIBRARIES) <-- The .a that we built 3997 # $(PRIVATE_STATIC_LIBRARIES) <-- The .a that we built
3989 # $(TARGET_LIBGCC) <-- libgcc.a 3998 # $(TARGET_LIBGCC) <-- libgcc.a
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
4034 'USE_STLPORT=1', 4043 'USE_STLPORT=1',
4035 '_STLP_USE_PTR_SPECIALIZATIONS=1', 4044 '_STLP_USE_PTR_SPECIALIZATIONS=1',
4036 'CHROME_BUILD_ID="<(chrome_build_id)"', 4045 'CHROME_BUILD_ID="<(chrome_build_id)"',
4037 ], 4046 ],
4038 'ldflags!': [ 4047 'ldflags!': [
4039 '-pthread', # Not supported by Android toolchain. 4048 '-pthread', # Not supported by Android toolchain.
4040 ], 4049 ],
4041 'ldflags': [ 4050 'ldflags': [
4042 '-nostdlib', 4051 '-nostdlib',
4043 '-Wl,--no-undefined', 4052 '-Wl,--no-undefined',
4044 # Don't export symbols from statically linked libraries. 4053
4045 '-Wl,--exclude-libs=ALL',
4046 ], 4054 ],
4047 'libraries': [ 4055 'libraries': [
4048 '-l<(android_stlport_library)', 4056 '-l<(android_stlport_library)',
4049 # Manually link the libgcc.a that the cross compiler uses. 4057 # Manually link the libgcc.a that the cross compiler uses.
4050 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)', 4058 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)',
4051 '-lc', 4059 '-lc',
4052 '-ldl', 4060 '-ldl',
4053 '-lm', 4061 '-lm',
4054 ], 4062 ],
4055 'conditions': [ 4063 'conditions': [
4056 ['component=="shared_library"', {
4057 'ldflags!': [
4058 '-Wl,--exclude-libs=ALL',
4059 ],
4060 }],
4061 ['clang==1', { 4064 ['clang==1', {
4062 'cflags': [ 4065 'cflags': [
4063 # Work around incompatibilities between bionic and clang 4066 # Work around incompatibilities between bionic and clang
4064 # headers. 4067 # headers.
4065 '-D__compiler_offsetof=__builtin_offsetof', 4068 '-D__compiler_offsetof=__builtin_offsetof',
4066 '-Dnan=__builtin_nan', 4069 '-Dnan=__builtin_nan',
4067 ], 4070 ],
4068 'conditions': [ 4071 'conditions': [
4069 ['target_arch=="arm"', { 4072 ['target_arch=="arm"', {
4070 'cflags': [ 4073 'cflags': [
(...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after
5232 # settings in target dicts. SYMROOT is a special case, because many other 5235 # settings in target dicts. SYMROOT is a special case, because many other
5233 # Xcode variables depend on it, including variables such as 5236 # Xcode variables depend on it, including variables such as
5234 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5237 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5235 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5238 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5236 # files to appear (when present) in the UI as actual files and not red 5239 # files to appear (when present) in the UI as actual files and not red
5237 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5240 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5238 # and therefore SYMROOT, needs to be set at the project level. 5241 # and therefore SYMROOT, needs to be set at the project level.
5239 'SYMROOT': '<(DEPTH)/xcodebuild', 5242 'SYMROOT': '<(DEPTH)/xcodebuild',
5240 }, 5243 },
5241 } 5244 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698