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

Side by Side Diff: build/config/BUILD.gn

Issue 569923003: Make content_shell_apk build completely (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-fix-apk-resources
Patch Set: Created 6 years, 3 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 | « breakpad/BUILD.gn ('k') | build/config/android/internal_rules.gni » ('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 (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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/allocator.gni") 5 import("//build/config/allocator.gni")
6 import("//build/config/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 9
10 declare_args() { 10 declare_args() {
(...skipping 18 matching lines...) Expand all
29 # For now we define these globally to match the current GYP build. 29 # For now we define these globally to match the current GYP build.
30 config("feature_flags") { 30 config("feature_flags") {
31 # TODO(brettw) most of these need to be parameterized. 31 # TODO(brettw) most of these need to be parameterized.
32 defines = [ 32 defines = [
33 "CHROMIUM_BUILD", 33 "CHROMIUM_BUILD",
34 "ENABLE_EGLIMAGE=1", 34 "ENABLE_EGLIMAGE=1",
35 "ENABLE_BACKGROUND=1", 35 "ENABLE_BACKGROUND=1",
36 "V8_DEPRECATION_WARNINGS", # Don't use deprecated V8 APIs anywhere. 36 "V8_DEPRECATION_WARNINGS", # Don't use deprecated V8 APIs anywhere.
37 ] 37 ]
38 38
39 if (enable_notifications) {
40 defines += [ "ENABLE_NOTIFICATIONS" ]
41 }
42
39 if (cld_version > 0) { 43 if (cld_version > 0) {
40 defines += [ "CLD_VERSION=$cld_version" ] 44 defines += [ "CLD_VERSION=$cld_version" ]
41 } 45 }
42 if (enable_mdns) { 46 if (enable_mdns) {
43 defines += [ "ENABLE_MDNS=1" ] 47 defines += [ "ENABLE_MDNS=1" ]
44 } 48 }
45 if (enable_notifications) { 49 if (enable_notifications) {
brettw 2014/09/20 05:47:36 Isn't this the thing you added above?
cjhopman 2014/09/22 18:43:52 Yep, looks like jamesr landed that bit before me.
46 defines += [ "ENABLE_NOTIFICATIONS" ] 50 defines += [ "ENABLE_NOTIFICATIONS" ]
47 } 51 }
48 if (enable_pepper_cdms) { 52 if (enable_pepper_cdms) {
49 # TODO(brettw) should probably be "=1" 53 # TODO(brettw) should probably be "=1"
50 defines += [ "ENABLE_PEPPER_CDMS" ] 54 defines += [ "ENABLE_PEPPER_CDMS" ]
51 } 55 }
52 if (enable_browser_cdms) { 56 if (enable_browser_cdms) {
53 # TODO(brettw) should probably be "=1" 57 # TODO(brettw) should probably be "=1"
54 defines += [ "ENABLE_BROWSER_CDMS" ] 58 defines += [ "ENABLE_BROWSER_CDMS" ]
55 } 59 }
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 "CoreText.framework", 292 "CoreText.framework",
289 "Foundation.framework", 293 "Foundation.framework",
290 "UIKit.framework", 294 "UIKit.framework",
291 ] 295 ]
292 } else if (is_linux) { 296 } else if (is_linux) {
293 libs = [ 297 libs = [
294 "dl", 298 "dl",
295 ] 299 ]
296 } 300 }
297 } 301 }
OLDNEW
« no previous file with comments | « breakpad/BUILD.gn ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698