From 16f55a10c4e73e46a58eb45587841914e6b0d851 Mon Sep 17 00:00:00 2001
From: aleloi <aleloi@webrtc.org>
Date: Tue, 23 Aug 2016 08:08:23 -0700
Subject: [PATCH] Migrated GN target :g711_test

Migrated GN target :g711_test from
webrtc/modules/audio_coding/codecs/g711/g711.gypi

NOTRY=True

BUG=webrtc:6191

Review-Url: https://codereview.webrtc.org/2273623002
Cr-Commit-Position: refs/heads/master@{#13864}
---
 .gn                                  |  1 +
 webrtc/base/BUILD.gn                 |  5 +++++
 webrtc/base/base.gyp                 |  7 +++++++
 webrtc/modules/audio_coding/BUILD.gn | 15 +++++++++++++++
 4 files changed, 28 insertions(+)

diff --git a/.gn b/.gn
index 75e2587cee..24ca3c186b 100644
--- a/.gn
+++ b/.gn
@@ -24,6 +24,7 @@ check_targets = [
   "//webrtc/voice_engine:level_indicator",
   "//webrtc/modules/audio_coding:isac_fix_test",
   "//webrtc/modules/audio_mixer:audio_conference_mixer",
+  "//webrtc/modules/audio_coding:g711_test",
 ]
 
 # These are the list of GN files that run exec_script. This whitelist exists
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 9bffa97da4..08c79e2c56 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -92,6 +92,7 @@ if (!rtc_build_ssl) {
 # The subset of rtc_base approved for use outside of libjingle.
 static_library("rtc_base_approved") {
   defines = []
+  libs = []
   deps = []
   configs += [ "..:common_config" ]
   public_configs = [ "..:common_inherited_config" ]
@@ -170,6 +171,10 @@ static_library("rtc_base_approved") {
     "trace_event.h",
   ]
 
+  if (is_android) {
+    libs += [ "log" ]
+  }
+
   if (build_with_chromium) {
     # Dependency on chromium's logging (in //base).
     deps += [ "//base:base" ]
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 032281e42d..e160f778aa 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -129,6 +129,13 @@
             },
           },
         }], # OS=="mac" and build_with_chromium==0
+        ['OS=="android"', {
+          'link_settings': {
+            'libraries': [
+              '-llog',
+            ],
+          },
+        }],
       ],
     },
     {
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 96dbd5b040..8a224ca80e 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -1539,4 +1539,19 @@ if (rtc_include_tests) {
       ]
     }
   }
+
+  executable("g711_test") {
+    testonly = true
+
+    sources = [
+      "codecs/g711/test/testG711.cc",
+    ]
+
+    configs += [ "../..:common_config" ]
+    public_configs = [ "../..:common_inherited_config" ]
+
+    deps = [
+      ":g711",
+    ]
+  }
 }