| OLD | NEW | 
|     1 # Copyright 2014 The Chromium Authors. All rights reserved. |     1 # Copyright 2014 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 import("//build/config/chrome_build.gni") |     5 import("//build/config/chrome_build.gni") | 
|     6 import("//build/config/compiler/compiler.gni") |     6 import("//build/config/compiler/compiler.gni") | 
|     7 import("//build/config/features.gni") |     7 import("//build/config/features.gni") | 
|     8 import("//build/config/locales.gni") |     8 import("//build/config/locales.gni") | 
|     9 import("//build/config/sanitizers/sanitizers.gni") |     9 import("//build/config/sanitizers/sanitizers.gni") | 
|    10 import("//build/config/ui.gni") |    10 import("//build/config/ui.gni") | 
| (...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   955     ] |   955     ] | 
|   956   } |   956   } | 
|   957  |   957  | 
|   958   # GYP: //chrome/chrome.gyp:page_info_connection_type_java |   958   # GYP: //chrome/chrome.gyp:page_info_connection_type_java | 
|   959   java_cpp_enum("page_info_connection_type_javagen") { |   959   java_cpp_enum("page_info_connection_type_javagen") { | 
|   960     sources = [ |   960     sources = [ | 
|   961       "browser/ui/android/website_settings_popup_android.h", |   961       "browser/ui/android/website_settings_popup_android.h", | 
|   962     ] |   962     ] | 
|   963   } |   963   } | 
|   964  |   964  | 
 |   965   # Some android targets still depend on --gc-sections to link. | 
 |   966   # TODO: remove --gc-sections for Debug builds (crbug.com/159847). | 
 |   967   config("gc_sections") { | 
 |   968     ldflags = [ "-Wl,--gc-sections" ] | 
 |   969   } | 
 |   970  | 
|   965   # GYP: //chrome/chrome_android.gypi:chrome_android_core |   971   # GYP: //chrome/chrome_android.gypi:chrome_android_core | 
|   966   static_library("chrome_android_core") { |   972   source_set("chrome_android_core") { | 
|   967     sources = [ |   973     sources = [ | 
|   968       "app/android/chrome_android_initializer.cc", |   974       "app/android/chrome_android_initializer.cc", | 
|   969       "app/android/chrome_android_initializer.h", |   975       "app/android/chrome_android_initializer.h", | 
|   970       "app/android/chrome_jni_onload.cc", |   976       "app/android/chrome_jni_onload.cc", | 
|   971       "app/android/chrome_jni_onload.h", |   977       "app/android/chrome_jni_onload.h", | 
|   972       "app/android/chrome_main_delegate_android.cc", |   978       "app/android/chrome_main_delegate_android.cc", | 
|   973       "app/android/chrome_main_delegate_android.h", |   979       "app/android/chrome_main_delegate_android.h", | 
|   974       "app/chrome_main_delegate.cc", |   980       "app/chrome_main_delegate.cc", | 
|   975       "app/chrome_main_delegate.h", |   981       "app/chrome_main_delegate.h", | 
|   976     ] |   982     ] | 
 |   983     public_configs = [ ":gc_sections" ] | 
|   977  |   984  | 
|   978     include_dirs = [ android_ndk_include_dir ] |   985     include_dirs = [ android_ndk_include_dir ] | 
|   979  |   986  | 
|   980     libs = [ |   987     libs = [ | 
|   981       "android", |   988       "android", | 
|   982       "jnigraphics", |   989       "jnigraphics", | 
|   983     ] |   990     ] | 
|   984  |   991  | 
|   985     deps = [ |   992     deps = [ | 
|   986       "//chrome/browser", |   993       "//chrome/browser", | 
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1072       "//chrome/app/theme/$branding_path_component/product_logo_48.png", |  1079       "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 
|  1073       "//chrome/tools/build/linux/chrome-wrapper", |  1080       "//chrome/tools/build/linux/chrome-wrapper", | 
|  1074       "//third_party/xdg-utils/scripts/xdg-mime", |  1081       "//third_party/xdg-utils/scripts/xdg-mime", | 
|  1075       "//third_party/xdg-utils/scripts/xdg-settings", |  1082       "//third_party/xdg-utils/scripts/xdg-settings", | 
|  1076     ] |  1083     ] | 
|  1077     outputs = [ |  1084     outputs = [ | 
|  1078       "$root_out_dir/{{source_file_part}}", |  1085       "$root_out_dir/{{source_file_part}}", | 
|  1079     ] |  1086     ] | 
|  1080   } |  1087   } | 
|  1081 } |  1088 } | 
| OLD | NEW |