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

Side by Side Diff: chrome/android/BUILD.gn

Issue 2415863002: Use PermissionType instead of ContentSettingsType in Android permission infobars (Closed)
Patch Set: Merge branch 'master' into use_permission_type_for_infobar Created 4 years, 2 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 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("//android_webview/webview_repack_locales_list.gni") 5 import("//android_webview/webview_repack_locales_list.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/rules.gni") 7 import("//build/config/android/rules.gni")
8 import("//build/util/process_version.gni") 8 import("//build/util/process_version.gni")
9 import("//build_overrides/v8.gni") 9 import("//build_overrides/v8.gni")
10 import("//chrome/android/chrome_public_apk_tmpl.gni") 10 import("//chrome/android/chrome_public_apk_tmpl.gni")
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 ] 191 ]
192 192
193 srcjar_deps = [ 193 srcjar_deps = [
194 ":chrome_android_java_enums_srcjar", 194 ":chrome_android_java_enums_srcjar",
195 ":chrome_webapk_signature_srcjar", 195 ":chrome_webapk_signature_srcjar",
196 ":chrome_android_java_google_api_keys_srcjar", 196 ":chrome_android_java_google_api_keys_srcjar",
197 ":chrome_version_srcjar", 197 ":chrome_version_srcjar",
198 ":resource_id_javagen", 198 ":resource_id_javagen",
199 "//chrome:content_setting_javagen", 199 "//chrome:content_setting_javagen",
200 "//chrome:content_settings_type_javagen", 200 "//chrome:content_settings_type_javagen",
201 "//chrome:permission_type_javagen",
201 "//chrome:data_use_ui_message_enum_javagen", 202 "//chrome:data_use_ui_message_enum_javagen",
202 "//chrome:signin_metrics_enum_javagen", 203 "//chrome:signin_metrics_enum_javagen",
203 ] 204 ]
204 205
205 # Manifest used for linting (determining unused resources). 206 # Manifest used for linting (determining unused resources).
206 android_manifest = chrome_public_android_manifest 207 android_manifest = chrome_public_android_manifest
207 208
208 # TODO(sievers): Split java code into components. Not everything 209 # TODO(sievers): Split java code into components. Not everything
209 # is really all that UI related here. 210 # is really all that UI related here.
210 if (android_java_ui) { 211 if (android_java_ui) {
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 instrumentation_test_apk("chrome_sync_shell_test_apk") { 742 instrumentation_test_apk("chrome_sync_shell_test_apk") {
742 apk_name = "ChromeSyncShellTest" 743 apk_name = "ChromeSyncShellTest"
743 apk_under_test = ":chrome_sync_shell_apk" 744 apk_under_test = ":chrome_sync_shell_apk"
744 android_manifest = chrome_sync_shell_test_apk_manifest 745 android_manifest = chrome_sync_shell_test_apk_manifest
745 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 746 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
746 deps = [ 747 deps = [
747 ":chrome_sync_shell_test_apk_java", 748 ":chrome_sync_shell_test_apk_java",
748 ] 749 ]
749 proguard_enabled = !is_java_debug 750 proguard_enabled = !is_java_debug
750 } 751 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698