diff options
Diffstat (limited to 'chromium/content/content.gyp')
| -rw-r--r-- | chromium/content/content.gyp | 129 |
1 files changed, 87 insertions, 42 deletions
diff --git a/chromium/content/content.gyp b/chromium/content/content.gyp index 14504ee8e57..fbd3b7d332d 100644 --- a/chromium/content/content.gyp +++ b/chromium/content/content.gyp @@ -6,7 +6,7 @@ 'variables': { 'chromium_code': 1, # Use higher warning level. 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 engine. - 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)', + 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)', }, 'target_defaults': { 'defines': ['CONTENT_IMPLEMENTATION'], @@ -24,6 +24,7 @@ 'conditions': [ ['OS != "ios"', { 'includes': [ + 'content_common_mojo_bindings.gypi', '../build/win_precompile.gypi', ], }], @@ -105,6 +106,9 @@ 'dependencies': [ 'content_common', ], + 'export_dependent_settings': [ + 'content_common', + ], }, { 'target_name': 'content_browser', @@ -257,11 +261,6 @@ 'content_resources.gyp:content_resources', ], 'conditions': [ - ['OS=="mac"', { - 'dependencies': [ - '<(DEPTH)/third_party/mach_override/mach_override.gyp:mach_override', - ], - }], ['chromium_enable_vtune_jit_for_v8==1', { 'dependencies': [ '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', @@ -304,11 +303,13 @@ 'target_name': 'content_app_both', 'type': 'none', 'dependencies': ['content'], + 'export_dependent_settings': ['content'], }, { 'target_name': 'content_browser', 'type': 'none', 'dependencies': ['content'], + 'export_dependent_settings': ['content'], }, { 'target_name': 'content_common', @@ -316,6 +317,7 @@ 'dependencies': ['content', 'content_resources.gyp:content_resources'], # Disable c4267 warnings until we fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], + 'export_dependent_settings': ['content'], }, { 'target_name': 'content_child', @@ -348,6 +350,7 @@ 'target_name': 'content_utility', 'type': 'none', 'dependencies': ['content'], + 'export_dependent_settings': ['content'], }, { 'target_name': 'content_worker', @@ -363,6 +366,7 @@ 'type': 'none', 'variables': { 'aidl_interface_file': 'public/android/java/src/org/chromium/content/common/common.aidl', + 'aidl_import_include': 'public/android/java/src', }, 'sources': [ 'public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl', @@ -371,21 +375,6 @@ 'includes': [ '../build/java_aidl.gypi' ], }, { - 'target_name': 'content_native_libraries_gen', - 'type': 'none', - 'sources': [ - 'public/android/java/templates/NativeLibraries.template', - ], - 'variables': { - 'package_name': 'org/chromium/content/app', - 'include_path': 'public/android/java/templates', - 'template_deps': [ - 'public/android/java/templates/native_libraries_array.h' - ], - }, - 'includes': [ '../build/android/java_cpp_template.gypi' ], - }, - { 'target_name': 'content_java', 'type': 'none', 'dependencies': [ @@ -395,20 +384,21 @@ '../ui/android/ui_android.gyp:ui_java', 'common_aidl', 'content_common', + 'content_strings_grd', + 'content_gamepad_mapping', + 'gesture_event_type_java', 'page_transition_types_java', 'popup_item_type_java', 'result_codes_java', 'speech_recognition_error_java', 'top_controls_state_java', - 'content_native_libraries_gen', + 'screen_orientation_values_java', ], 'variables': { 'java_in_dir': '../content/public/android/java', - 'jar_excluded_classes': [ '*/NativeLibraries.class' ], 'has_java_resources': 1, 'R_package': 'org.chromium.content', 'R_package_relpath': 'org/chromium/content', - 'java_strings_grd': 'android_content_strings.grd', }, 'conditions': [ ['android_webview_build == 0', { @@ -421,6 +411,30 @@ 'includes': [ '../build/java.gypi' ], }, { + 'target_name': 'content_strings_grd', + # The android_webview/Android.mk file depends on this target directly. + 'android_unmangled_name': 1, + 'type': 'none', + 'variables': { + 'grd_file': '../content/public/android/java/strings/android_content_strings.grd', + }, + 'includes': [ + '../build/java_strings_grd.gypi', + ], + }, + { + 'target_name': 'gesture_event_type_java', + 'type': 'none', + 'sources': [ + 'public/android/java/src/org/chromium/content/browser/GestureEventType.template', + ], + 'variables': { + 'package_name': 'org/chromium/content/browser', + 'template_deps': ['browser/android/gesture_event_type_list.h'], + }, + 'includes': [ '../build/android/java_cpp_template.gypi' ], + }, + { 'target_name': 'page_transition_types_java', 'type': 'none', 'sources': [ @@ -481,6 +495,18 @@ 'includes': [ '../build/android/java_cpp_template.gypi' ], }, { + 'target_name': 'screen_orientation_values_java', + 'type': 'none', + 'sources': [ + 'public/android/java/src/org/chromium/content/common/ScreenOrientationValues.template', + ], + 'variables': { + 'package_name': 'org/chromium/content/common', + 'template_deps': ['public/common/screen_orientation_values_list.h'], + }, + 'includes': [ '../build/android/java_cpp_template.gypi' ], + }, + { 'target_name': 'java_set_jni_headers', 'type': 'none', 'variables': { @@ -490,36 +516,55 @@ 'includes': [ '../build/jar_file_jni_generator.gypi' ], }, { + 'target_name': 'motionevent_jni_headers', + 'type': 'none', + 'variables': { + 'jni_gen_package': 'content', + 'input_java_class': 'android/view/MotionEvent.class', + }, + 'includes': [ '../build/jar_file_jni_generator.gypi' ], + }, + { 'target_name': 'content_jni_headers', 'type': 'none', 'dependencies': [ - 'java_set_jni_headers' + 'java_set_jni_headers', + 'motionevent_jni_headers' ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)/content', - ], - }, 'includes': [ 'content_jni.gypi' ], }, { - 'target_name': 'content_android_linker', - 'type': 'shared_library', + 'target_name': 'content_icudata', + 'type': 'none', 'conditions': [ - ['android_webview_build == 0', { - # Avoid breaking the webview build because it doesn't have - # <(android_ndk_root)/crazy_linker.gyp. Note that it never uses - # the linker anyway. - 'sources': [ - 'common/android/linker/linker_jni.cc', - ], - 'dependencies': [ - '<(android_ndk_root)/crazy_linker.gyp:crazy_linker', + ['icu_use_data_file_flag==1', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/content_shell/assets', + 'files': [ + '<(PRODUCT_DIR)/icudtl.dat', + ], + }, ], }], ], }, - + { + 'target_name': 'content_gamepad_mapping', + 'type': 'none', + 'sources': [ + 'public/android/java/src/org/chromium/content/browser/input/CanonicalButtonIndex.template', + 'public/android/java/src/org/chromium/content/browser/input/CanonicalAxisIndex.template', + ], + 'variables': { + 'package_name': 'org/chromium/content/browser/input', + 'template_deps': [ + 'browser/gamepad/canonical_axis_index_list.h', + 'browser/gamepad/canonical_button_index_list.h', + ], + }, + 'includes': [ '../build/android/java_cpp_template.gypi' ], + }, ], }], # OS == "android" ], |