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

Side by Side Diff: build/common.gypi

Issue 454923002: Don't register JNI methods for the android_webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« 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 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after
1773 # When building as part of the Android system, use system libraries 1773 # When building as part of the Android system, use system libraries
1774 # where possible to reduce ROM size. 1774 # where possible to reduce ROM size.
1775 # TODO(steveblock): Investigate using the system version of sqlite. 1775 # TODO(steveblock): Investigate using the system version of sqlite.
1776 'use_system_sqlite%': 0, # '<(android_webview_build)', 1776 'use_system_sqlite%': 0, # '<(android_webview_build)',
1777 'use_system_expat%': '<(android_webview_build)', 1777 'use_system_expat%': '<(android_webview_build)',
1778 'use_system_icu%': '<(android_webview_build)', 1778 'use_system_icu%': '<(android_webview_build)',
1779 'use_system_stlport%': '<(android_webview_build)', 1779 'use_system_stlport%': '<(android_webview_build)',
1780 1780
1781 # Copy it out one scope. 1781 # Copy it out one scope.
1782 'android_webview_build%': '<(android_webview_build)', 1782 'android_webview_build%': '<(android_webview_build)',
1783
1784 # Default android linker script for shared library exports.
1785 'android_linker_script%': '<(SHARED_INTERMEDIATE_DIR)/android_exports.ls t',
1783 }], # OS=="android" 1786 }], # OS=="android"
1784 ['embedded==1', { 1787 ['embedded==1', {
1785 'use_system_fontconfig%': 0, 1788 'use_system_fontconfig%': 0,
1786 }, { 1789 }, {
1787 'use_system_fontconfig%': 1, 1790 'use_system_fontconfig%': 1,
1788 }], 1791 }],
1789 ['chromecast==1', { 1792 ['chromecast==1', {
1790 'ffmpeg_branding%': 'Chrome', 1793 'ffmpeg_branding%': 'Chrome',
1791 'ozone_platform_ozonex%': 1, 1794 'ozone_platform_ozonex%': 1,
1792 'conditions': [ 1795 'conditions': [
(...skipping 2550 matching lines...) Expand 10 before | Expand all | Expand 10 after
4343 # versions with the same name (e.g. skia, icu). 4346 # versions with the same name (e.g. skia, icu).
4344 ['component=="shared_library"', { 4347 ['component=="shared_library"', {
4345 'android_product_extension': 'cr.so', 4348 'android_product_extension': 'cr.so',
4346 }, { 4349 }, {
4347 'android_product_extension': 'so', 4350 'android_product_extension': 'so',
4348 } ], 4351 } ],
4349 ], 4352 ],
4350 }, 4353 },
4351 'target_conditions': [ 4354 'target_conditions': [
4352 ['_type=="shared_library"', { 4355 ['_type=="shared_library"', {
4353 'product_extension': '<(android_product_extension)', 4356 'product_extension': '<(android_product_extension)',
4354 }], 4357 }],
4355 4358
4356 # Settings for building device targets using Android's toolchain. 4359 # Settings for building device targets using Android's toolchain.
4357 # These are based on the setup.mk file from the Android NDK. 4360 # These are based on the setup.mk file from the Android NDK.
4358 # 4361 #
4359 # The NDK Android executable link step looks as follows: 4362 # The NDK Android executable link step looks as follows:
4360 # $LDFLAGS 4363 # $LDFLAGS
4361 # $(TARGET_CRTBEGIN_DYNAMIC_O) <-- crtbegin.o 4364 # $(TARGET_CRTBEGIN_DYNAMIC_O) <-- crtbegin.o
4362 # $(PRIVATE_OBJECTS) <-- The .o that we built 4365 # $(PRIVATE_OBJECTS) <-- The .o that we built
4363 # $(PRIVATE_STATIC_LIBRARIES) <-- The .a that we built 4366 # $(PRIVATE_STATIC_LIBRARIES) <-- The .a that we built
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
4409 'USE_STLPORT=1', 4412 'USE_STLPORT=1',
4410 '_STLP_USE_PTR_SPECIALIZATIONS=1', 4413 '_STLP_USE_PTR_SPECIALIZATIONS=1',
4411 'CHROME_BUILD_ID="<(chrome_build_id)"', 4414 'CHROME_BUILD_ID="<(chrome_build_id)"',
4412 ], 4415 ],
4413 'ldflags!': [ 4416 'ldflags!': [
4414 '-pthread', # Not supported by Android toolchain. 4417 '-pthread', # Not supported by Android toolchain.
4415 ], 4418 ],
4416 'ldflags': [ 4419 'ldflags': [
4417 '-nostdlib', 4420 '-nostdlib',
4418 '-Wl,--no-undefined', 4421 '-Wl,--no-undefined',
4419 # Don't export symbols from statically linked libraries.
4420 '-Wl,--exclude-libs=ALL',
4421 ], 4422 ],
4422 'libraries': [ 4423 'libraries': [
4423 '-l<(android_stlport_library)', 4424 '-l<(android_stlport_library)',
4424 # Manually link the libgcc.a that the cross compiler uses. 4425 # Manually link the libgcc.a that the cross compiler uses.
4425 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)', 4426 '<!(<(android_toolchain)/*-gcc -print-libgcc-file-name)',
4426 '-lc', 4427 '-lc',
4427 '-ldl', 4428 '-ldl',
4428 '-lm', 4429 '-lm',
4429 ], 4430 ],
4430 'conditions': [ 4431 'conditions': [
4431 ['component=="shared_library"', { 4432 ['component=="static_library"', {
4432 'ldflags!': [ 4433 'ldflags': [
4433 '-Wl,--exclude-libs=ALL', 4434 '-Wl,--exclude-libs=ALL',
4434 ], 4435 ],
4435 }], 4436 }],
4436 ['clang==1', { 4437 ['clang==1', {
4437 'cflags': [ 4438 'cflags': [
4438 # Work around incompatibilities between bionic and clang 4439 # Work around incompatibilities between bionic and clang
4439 # headers. 4440 # headers.
4440 '-D__compiler_offsetof=__builtin_offsetof', 4441 '-D__compiler_offsetof=__builtin_offsetof',
4441 '-Dnan=__builtin_nan', 4442 '-Dnan=__builtin_nan',
4442 ], 4443 ],
(...skipping 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after
5680 # settings in target dicts. SYMROOT is a special case, because many other 5681 # settings in target dicts. SYMROOT is a special case, because many other
5681 # Xcode variables depend on it, including variables such as 5682 # Xcode variables depend on it, including variables such as
5682 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5683 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5683 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5684 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5684 # files to appear (when present) in the UI as actual files and not red 5685 # files to appear (when present) in the UI as actual files and not red
5685 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5686 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5686 # and therefore SYMROOT, needs to be set at the project level. 5687 # and therefore SYMROOT, needs to be set at the project level.
5687 'SYMROOT': '<(DEPTH)/xcodebuild', 5688 'SYMROOT': '<(DEPTH)/xcodebuild',
5688 }, 5689 },
5689 } 5690 }
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