| 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 955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 966 ] | 966 ] |
| 967 } | 967 } |
| 968 | 968 |
| 969 # GYP: //chrome/chrome.gyp:page_info_connection_type_java | 969 # GYP: //chrome/chrome.gyp:page_info_connection_type_java |
| 970 java_cpp_enum("page_info_connection_type_javagen") { | 970 java_cpp_enum("page_info_connection_type_javagen") { |
| 971 sources = [ | 971 sources = [ |
| 972 "browser/ui/android/website_settings_popup_android.h", | 972 "browser/ui/android/website_settings_popup_android.h", |
| 973 ] | 973 ] |
| 974 } | 974 } |
| 975 | 975 |
| 976 # GYP: //chrome/chrome.gyp:website_settings_action_java |
| 977 java_cpp_enum("website_settings_action_javagen") { |
| 978 sources = [ |
| 979 "browser/ui/website_settings/website_settings.h", |
| 980 ] |
| 981 } |
| 982 |
| 976 # Some android targets still depend on --gc-sections to link. | 983 # Some android targets still depend on --gc-sections to link. |
| 977 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). | 984 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). |
| 978 config("gc_sections") { | 985 config("gc_sections") { |
| 979 ldflags = [ "-Wl,--gc-sections" ] | 986 ldflags = [ "-Wl,--gc-sections" ] |
| 980 } | 987 } |
| 981 | 988 |
| 982 # GYP: //chrome/chrome_android.gypi:chrome_android_core | 989 # GYP: //chrome/chrome_android.gypi:chrome_android_core |
| 983 source_set("chrome_android_core") { | 990 source_set("chrome_android_core") { |
| 984 sources = [ | 991 sources = [ |
| 985 "app/android/chrome_android_initializer.cc", | 992 "app/android/chrome_android_initializer.cc", |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1090 "//chrome/app/theme/$branding_path_component/product_logo_48.png", | 1097 "//chrome/app/theme/$branding_path_component/product_logo_48.png", |
| 1091 "//chrome/tools/build/linux/chrome-wrapper", | 1098 "//chrome/tools/build/linux/chrome-wrapper", |
| 1092 "//third_party/xdg-utils/scripts/xdg-mime", | 1099 "//third_party/xdg-utils/scripts/xdg-mime", |
| 1093 "//third_party/xdg-utils/scripts/xdg-settings", | 1100 "//third_party/xdg-utils/scripts/xdg-settings", |
| 1094 ] | 1101 ] |
| 1095 outputs = [ | 1102 outputs = [ |
| 1096 "$root_out_dir/{{source_file_part}}", | 1103 "$root_out_dir/{{source_file_part}}", |
| 1097 ] | 1104 ] |
| 1098 } | 1105 } |
| 1099 } | 1106 } |
| OLD | NEW |