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

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

Issue 1818423003: Revert of Remove configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines
Patch Set: Created 4 years, 9 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
« no previous file with comments | « chrome/BUILD.gn ('k') | chrome/android/chrome_apk.gyp » ('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 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/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 deps = [ 53 deps = [
54 ":chrome_locale_paks", 54 ":chrome_locale_paks",
55 ":chrome_strings_grd", 55 ":chrome_strings_grd",
56 "//chrome/app:java_strings_grd", 56 "//chrome/app:java_strings_grd",
57 "//components/policy:app_restrictions_resources", 57 "//components/policy:app_restrictions_resources",
58 "//components/strings:components_strings_grd", 58 "//components/strings:components_strings_grd",
59 "//content/public/android:content_java_resources", 59 "//content/public/android:content_java_resources",
60 "//third_party/android_data_chart:android_data_chart_java_resources", 60 "//third_party/android_data_chart:android_data_chart_java_resources",
61 "//third_party/android_media:android_media_resources", 61 "//third_party/android_media:android_media_resources",
62 ] 62 ]
63 if (!enable_configuration_policy) {
64 deps -= [ "//components/policy:app_restrictions_resources" ]
65 }
63 custom_package = "org.chromium.chrome" 66 custom_package = "org.chromium.chrome"
64 } 67 }
65 68
66 # GYP: //chrome/chrome.gyp:chrome_strings_grd 69 # GYP: //chrome/chrome.gyp:chrome_strings_grd
67 java_strings_grd("chrome_strings_grd") { 70 java_strings_grd("chrome_strings_grd") {
68 grd_file = "java/strings/android_chrome_strings.grd" 71 grd_file = "java/strings/android_chrome_strings.grd"
69 outputs = [ 72 outputs = [
70 "values-am/android_chrome_strings.xml", 73 "values-am/android_chrome_strings.xml",
71 "values-ar/android_chrome_strings.xml", 74 "values-ar/android_chrome_strings.xml",
72 "values-bg/android_chrome_strings.xml", 75 "values-bg/android_chrome_strings.xml",
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 apk_name = "ChromeSyncShellTest" 585 apk_name = "ChromeSyncShellTest"
583 apk_under_test = ":chrome_sync_shell_apk" 586 apk_under_test = ":chrome_sync_shell_apk"
584 android_manifest = chrome_sync_shell_test_apk_manifest 587 android_manifest = chrome_sync_shell_test_apk_manifest
585 deps = [ 588 deps = [
586 ":chrome_sync_shell_test_apk_java", 589 ":chrome_sync_shell_test_apk_java",
587 ":chrome_sync_shell_test_apk_manifest", 590 ":chrome_sync_shell_test_apk_manifest",
588 ] 591 ]
589 isolate_file = "../chrome_sync_shell_test_apk.isolate" 592 isolate_file = "../chrome_sync_shell_test_apk.isolate"
590 proguard_enabled = !is_debug 593 proguard_enabled = !is_debug
591 } 594 }
OLDNEW
« no previous file with comments | « chrome/BUILD.gn ('k') | chrome/android/chrome_apk.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698