From 48052316130d8ba98ccfe748179013a633e3cbf7 Mon Sep 17 00:00:00 2001
From: ivoc <ivoc@webrtc.org>
Date: Thu, 25 Aug 2016 04:43:45 -0700
Subject: [PATCH] Moved format_macros.h from rtc_base to rtc_base_approved.

BUG=webrtc:3806
NOTRY=True

Review-Url: https://codereview.webrtc.org/2272003002
Cr-Commit-Position: refs/heads/master@{#13921}
---
 webrtc/base/BUILD.gn                                   | 2 +-
 webrtc/base/base.gyp                                   | 2 +-
 webrtc/modules/audio_coding/BUILD.gn                   | 4 ++--
 webrtc/modules/audio_coding/codecs/isac/isac_test.gypi | 2 +-
 webrtc/modules/audio_coding/codecs/opus/opus.gypi      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index baf6bfd533..49bd66ae06 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -124,6 +124,7 @@ static_library("rtc_base_approved") {
     "event_tracer.h",
     "exp_filter.cc",
     "exp_filter.h",
+    "format_macros.h",
     "location.cc",
     "location.h",
     "md5.cc",
@@ -299,7 +300,6 @@ static_library("rtc_base") {
     "firewallsocketserver.h",
     "flags.cc",
     "flags.h",
-    "format_macros.h",
     "gunit_prod.h",
     "helpers.cc",
     "helpers.h",
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index e160f778aa..52c4059cc5 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -54,6 +54,7 @@
         'event_tracer.h',
         'exp_filter.cc',
         'exp_filter.h',
+        'format_macros.h',
         'location.h',
         'location.cc',
         'md5.cc',
@@ -235,7 +236,6 @@
         'firewallsocketserver.h',
         'flags.cc',
         'flags.h',
-        'format_macros.h',
         'gunit_prod.h',
         'helpers.cc',
         'helpers.h',
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index b5474a31c7..0ea5035bdd 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -1553,7 +1553,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":isac",
-      "../../base:rtc_base",
+      "../../base:rtc_base_approved",
       "//build/config/sanitizers:deps",
     ]
 
@@ -1608,7 +1608,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":webrtc_opus",
-      "../../base:rtc_base",
+      "../../base:rtc_base_approved",
       "../../common_audio",
       "../../test:test_support",
       "../../test:test_support_main",
diff --git a/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi b/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi
index 4edd01d4c4..744885d396 100644
--- a/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi
+++ b/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi
@@ -14,7 +14,7 @@
       'type': 'executable',
       'dependencies': [
         'isac',
-        '<(webrtc_root)/base/base.gyp:rtc_base',
+        '<(webrtc_root)/base/base.gyp:rtc_base_approved',
       ],
       'include_dirs': [
         './main/include',
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus.gypi b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
index 145c7d4391..10b9da96c4 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+++ b/webrtc/modules/audio_coding/codecs/opus/opus.gypi
@@ -58,7 +58,7 @@
           'type': 'executable',
           'dependencies': [
             'webrtc_opus',
-            '<(webrtc_root)/base/base.gyp:rtc_base',
+            '<(webrtc_root)/base/base.gyp:rtc_base_approved',
             '<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
             '<(webrtc_root)/test/test.gyp:test_support_main',
             '<(DEPTH)/testing/gtest.gyp:gtest',