diff options
author | brettw <brettw@chromium.org> | 2015-04-30 18:09:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-01 01:10:14 +0000 |
commit | edff53a35780ba2f515c7e8d4f7131c91151e1a3 (patch) | |
tree | a951d77ed6739fe96ca5bffa6713c2e6a919675e /content/app | |
parent | 0c215419d6743dd77e5c42d35d5819ffe679340c (diff) | |
download | chromium_src-edff53a35780ba2f515c7e8d4f7131c91151e1a3.zip chromium_src-edff53a35780ba2f515c7e8d4f7131c91151e1a3.tar.gz chromium_src-edff53a35780ba2f515c7e8d4f7131c91151e1a3.tar.bz2 |
Add a GN flag for the Windows multi-dll build.
The first pass of moving the other Chrome-specific build flags out of the root build config file and into the new one. This requires both ffmpeg and Blink changes to finish landing.
R=scottmg@chromium.org
TBR=ddorwin@chromium.org (widevine)
Review URL: https://codereview.chromium.org/1120803003
Cr-Commit-Position: refs/heads/master@{#327854}
Diffstat (limited to 'content/app')
-rw-r--r-- | content/app/BUILD.gn | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index f6c72b9..8da75d4 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -2,8 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# TODO(GYP) enable chrome_multiple_dll support -is_chrome_multiple_dll = false +import("//build/config/chrome_build.gni") content_app_sources = [ "android/app_jni_registrar.cc", @@ -71,7 +70,7 @@ content_app_extra_configs = [ "//content:content_implementation", ] -if (!is_chrome_multiple_dll) { +if (!is_multi_dll_chrome) { content_app_deps += [ "//content/gpu:gpu_sources" ] } @@ -86,7 +85,7 @@ source_set("both") { deps = content_app_deps } -if (is_chrome_multiple_dll) { +if (is_multi_dll_chrome) { # It doesn't make sense to do the browser/child dll split in component mode. assert(!is_component_build) @@ -97,7 +96,7 @@ if (is_chrome_multiple_dll) { configs += content_app_extra_configs deps = content_app_deps - defines += [ "CHROME_MULTIPLE_DLL_BROWSER" ] + defines = [ "CHROME_MULTIPLE_DLL_BROWSER" ] } source_set("child") { @@ -107,6 +106,6 @@ if (is_chrome_multiple_dll) { configs += content_app_extra_configs deps = content_app_deps - defines += [ "CHROME_MULTIPLE_DLL_CHILD" ] + defines = [ "CHROME_MULTIPLE_DLL_CHILD" ] } } |