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

Unified Diff: content/BUILD.gn

Issue 533743004: Fix Chrome linker errors in GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/gcm_driver/BUILD.gn ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/BUILD.gn
diff --git a/content/BUILD.gn b/content/BUILD.gn
index 88f705ba5c1e6fb0f912ea9c8d37cd276e32761d..b4eeb264ee5596f8eaab08d03461966f234085c2 100644
--- a/content/BUILD.gn
+++ b/content/BUILD.gn
@@ -54,79 +54,3 @@ source_set("export") {
"content/common/content_export.h"
]
}
-
-# Stubs ------------------------------------------------------------------------
-
-# TODO(brettw) remove this and add a proper dependency on libjingle once that
-# target has been converted to GN. This config sets up the include directories
-# so content can compile in the meantime.
-config("libjingle_stub_config") {
- include_dirs = [
- "//third_party/libjingle/overrides",
- "//third_party/libjingle/source",
- "//third_party/libyuv/include",
- "//third_party/usrsctp",
-
-
- "//third_party/webrtc/overrides", # Must be before webrtc abd third_party.
- "//third_party/webrtc",
- "//third_party",
- ]
-
- defines = [
- "FEATURE_ENABLE_SSL",
- "FEATURE_ENABLE_VOICEMAIL",
- "EXPAT_RELATIVE_PATH",
- "GTEST_RELATIVE_PATH",
- "NO_MAIN_THREAD_WRAPPING",
- "NO_SOUND_SYSTEM",
- ]
-
- if (is_mac) {
- defines += [ "OSX", "WEBRTC_MAC" ]
- } else if (is_linux) {
- defines += [ "LINUX", "WEBRTC_LINUX" ]
- } else if (is_android) {
- defines += [ "ANDROID", "WEBRTC_LINUX", "WEBRTC_ANDROID" ]
- } else if (is_win) {
- libs = [ "secur32.lib", "crypt32.lib", "iphlpapi.lib" ]
- defines += [ "WEBRTC_WIN" ]
- }
-
- if (is_posix) {
- defines += [ "POSIX", "WEBRTC_POSIX" ]
- }
- if (is_chromeos) {
- defines += [ "CHROMEOS" ]
- }
-}
-
-# Sets up include dirs while webrtc is being converted to GN.
-# TODO(GYP) remove when webrtc is ready.
-config("webrtc_stub_config") {
- defines = [ "WEBRTC_CHROMIUM_BUILD" ]
- include_dirs = [
- "//third_party/webrtc/overrides", # Must be first.
- "//third_party",
- ]
-
- if (is_mac) {
- defines += [ "WEBRTC_MAC" ]
- } else if (is_win) {
- defines += [ "WEBRTC_WIN" ]
- } else if (is_linux) {
- defines += [ "WEBRTC_LINUX" ]
- } else if (is_ios) {
- defines += [ "WEBRTC_MAC", "WEBRTC_IOS" ]
- } else if (is_android) {
- defines += [ "WEBRTC_LINUX", "WEBRTC_ANDROID" ]
- import("//build/config/crypto.gni")
- if (use_openssl) {
- defines += [ "WEBRTC_ANDROID_OPENSLEQS" ]
- }
- }
-
- if (is_posix) {
- defines += [ "WEBRTC_POSIX" ]
- }
-}
« no previous file with comments | « components/gcm_driver/BUILD.gn ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698