Split targets mixing .c and .cc sources.

Split targets mixing .c and .cc sources.

The Bazel build format doesn't support having separate
lists of compilation flags for C and C++; it just has a single
copts list for cc_library:
https://bazel.build/versions/master/docs/be/c-cpp.html#cc_binary.copts

This makes it hard to convert our GN targets to Bazel when there are
compiler warnings that aren't supported for C (like -Woverloaded-virtual
being added in bugs.webrtc.org/6653).

The solution for this is to move all .c files to their own targets
and remove C++-only compiler flags during conversion.

New targets:
//webrtc/common_audio:common_audio_c
//webrtc/common_audio:common_audio_neon_c
//webrtc/modules/audio_coding:g711_c
//webrtc/modules/audio_coding:g722_c
//webrtc/modules/audio_coding:ilbc_c
//webrtc/modules/audio_coding:isac_c
//webrtc/modules/audio_coding:isac_fix_c
//webrtc/modules/audio_coding:isac_test_util
//webrtc/modules/audio_coding:pcm16b_c
//webrtc/modules/audio_coding:webrtc_opusj_c
//webrtc/modules/audio_device:mac_portaudio
//webrtc/modules/audio_procssing:audio_processing_c
//webrtc/modules/audio_procssing:audio_processing_neon_c

This CL also adds a PRESUBMIT.py check that will throw an error
if targets are mixing .c and .cc files, to preven this from regressing.

BUG=webrtc:6653
NOTRY=True

Committed: https://crrev.com/7439f973f72536cd9822d4e97b294185a9950b36
Cr-Commit-Position: refs/heads/master@{#15433}

[kjellander_webrtc, 2016-12-02 10:53:20]

Description was changed from

==========
Split targets mixing .c and .cc sources.

The Bazel build format doesn't support having separate
lists of compilation flags for C and C++; it just has a single
copts list for cc_library:
https://bazel.build/versions/master/docs/be/c-cpp.html#cc_binary.copts

This makes it hard to convert our GN targets to Bazel when there are
compiler warnings that aren't supported for C (like -Woverloaded-virtual
being added in bugs.webrtc.org/6653).

The solution for this is to move all .c files to their own targets
and remove C++-only compiler flags during conversion.

This CL also adds a PRESUBMIT.py check that will throw an error
if targets are mixing .c and .cc files, to preven this from regressing.

BUG=webrtc:6653
==========

to

==========
Split targets mixing .c and .cc sources.

The Bazel build format doesn't support having separate
lists of compilation flags for C and C++; it just has a single
copts list for cc_library:
https://bazel.build/versions/master/docs/be/c-cpp.html#cc_binary.copts

This makes it hard to convert our GN targets to Bazel when there are
compiler warnings that aren't supported for C (like -Woverloaded-virtual
being added in bugs.webrtc.org/6653).

The solution for this is to move all .c files to their own targets
and remove C++-only compiler flags during conversion.

New targets:
//webrtc/common_audio:common_audio_c
//webrtc/common_audio:common_audio_neon_c
//webrtc/modules/audio_coding:g711_c
//webrtc/modules/audio_coding:g722_c
//webrtc/modules/audio_coding:ilbc_c
//webrtc/modules/audio_coding:isac_c
//webrtc/modules/audio_coding:isac_fix_c
//webrtc/modules/audio_coding:isac_test_util
//webrtc/modules/audio_coding:pcm16b_c
//webrtc/modules/audio_coding:webrtc_opusj_c
//webrtc/modules/audio_device:mac_portaudio
//webrtc/modules/audio_procssing:audio_processing_c
//webrtc/modules/audio_procssing:audio_processing_neon_c

This CL also adds a PRESUBMIT.py check that will throw an error
if targets are mixing .c and .cc files, to preven this from regressing.

BUG=webrtc:6653
==========

[kjellander_webrtc, 2016-12-02 11:02:50]

Patchset #1 (id:1) has been deleted

[kjellander_webrtc, 2016-12-02 11:02:59]

Patchset #1 (id:20001) has been deleted

[kjellander_webrtc, 2016-12-02 12:28:17]

Patchset #1 (id:40001) has been deleted

[kjellander_webrtc, 2016-12-02 12:28:22]

Patchset #1 (id:60001) has been deleted

[kjellander_webrtc, 2016-12-02 12:28:27]

Patchset #1 (id:80001) has been deleted

[kjellander_webrtc, 2016-12-05 10:46:02]

kjellander@webrtc.org changed reviewers:
+ henrik.lundin@webrtc.org, henrika@webrtc.org

[kjellander_webrtc, 2016-12-05 10:46:03]

henrik.lundin@: main review
henrika@: rubberstamp for audio_device.

I'm landing a CL internally to solve the internal trybot error.
I will create a PS#3 before landing, bringing back the PRESUBMIT.py check from
PS#1.

[henrika_webrtc, 2016-12-05 11:21:41]

LGTM

[hlundin-webrtc, 2016-12-05 11:37:01]

lgtm with one optional nit.

https://codereview.webrtc.org/2550563003/diff/120001/webrtc/modules/audio_cod...
File webrtc/modules/audio_coding/BUILD.gn (right):

https://codereview.webrtc.org/2550563003/diff/120001/webrtc/modules/audio_cod...
webrtc/modules/audio_coding/BUILD.gn:808: public_deps = [
Make this a one-liner like you did at line 793 above.

[kjellander_webrtc, 2016-12-06 06:00:55]

Description was changed from

==========
Split targets mixing .c and .cc sources.

The Bazel build format doesn't support having separate
lists of compilation flags for C and C++; it just has a single
copts list for cc_library:
https://bazel.build/versions/master/docs/be/c-cpp.html#cc_binary.copts

This makes it hard to convert our GN targets to Bazel when there are
compiler warnings that aren't supported for C (like -Woverloaded-virtual
being added in bugs.webrtc.org/6653).

The solution for this is to move all .c files to their own targets
and remove C++-only compiler flags during conversion.

New targets:
//webrtc/common_audio:common_audio_c
//webrtc/common_audio:common_audio_neon_c
//webrtc/modules/audio_coding:g711_c
//webrtc/modules/audio_coding:g722_c
//webrtc/modules/audio_coding:ilbc_c
//webrtc/modules/audio_coding:isac_c
//webrtc/modules/audio_coding:isac_fix_c
//webrtc/modules/audio_coding:isac_test_util
//webrtc/modules/audio_coding:pcm16b_c
//webrtc/modules/audio_coding:webrtc_opusj_c
//webrtc/modules/audio_device:mac_portaudio
//webrtc/modules/audio_procssing:audio_processing_c
//webrtc/modules/audio_procssing:audio_processing_neon_c

This CL also adds a PRESUBMIT.py check that will throw an error
if targets are mixing .c and .cc files, to preven this from regressing.

BUG=webrtc:6653
==========

to

==========
Split targets mixing .c and .cc sources.

The Bazel build format doesn't support having separate
lists of compilation flags for C and C++; it just has a single
copts list for cc_library:
https://bazel.build/versions/master/docs/be/c-cpp.html#cc_binary.copts

This makes it hard to convert our GN targets to Bazel when there are
compiler warnings that aren't supported for C (like -Woverloaded-virtual
being added in bugs.webrtc.org/6653).

The solution for this is to move all .c files to their own targets
and remove C++-only compiler flags during conversion.

New targets:
//webrtc/common_audio:common_audio_c
//webrtc/common_audio:common_audio_neon_c
//webrtc/modules/audio_coding:g711_c
//webrtc/modules/audio_coding:g722_c
//webrtc/modules/audio_coding:ilbc_c
//webrtc/modules/audio_coding:isac_c
//webrtc/modules/audio_coding:isac_fix_c
//webrtc/modules/audio_coding:isac_test_util
//webrtc/modules/audio_coding:pcm16b_c
//webrtc/modules/audio_coding:webrtc_opusj_c
//webrtc/modules/audio_device:mac_portaudio
//webrtc/modules/audio_procssing:audio_processing_c
//webrtc/modules/audio_procssing:audio_processing_neon_c

This CL also adds a PRESUBMIT.py check that will throw an error
if targets are mixing .c and .cc files, to preven this from regressing.

BUG=webrtc:6653
NOTRY=True
==========

[kjellander_webrtc, 2016-12-06 06:00:59]

The CQ bit was checked by kjellander@webrtc.org

[kjellander_webrtc, 2016-12-06 06:00:59]

The patchset sent to the CQ was uploaded after l-g-t-m from
henrik.lundin@webrtc.org, henrika@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2550563003/#ps160001 (title:
"Fixed nit")

[commit-bot: I haz the power, 2016-12-06 06:01:03]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2016-12-06 06:04:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-06 06:04:22]

Failed to apply patch for webrtc/modules/audio_processing/BUILD.gn:
While running git apply --index -p1;
  error: patch failed: webrtc/modules/audio_processing/BUILD.gn:167
  error: webrtc/modules/audio_processing/BUILD.gn: patch does not apply

Patch:       webrtc/modules/audio_processing/BUILD.gn
Index: webrtc/modules/audio_processing/BUILD.gn
diff --git a/webrtc/modules/audio_processing/BUILD.gn
b/webrtc/modules/audio_processing/BUILD.gn
index
9a5daac13cdc75d681b460002e4220e00df35cd3..7bf425aef673c32a70bbef1fc31b902a463554ad
100644
--- a/webrtc/modules/audio_processing/BUILD.gn
+++ b/webrtc/modules/audio_processing/BUILD.gn
@@ -35,11 +35,6 @@ rtc_static_library("audio_processing") {
     "agc/agc_manager_direct.cc",
     "agc/agc_manager_direct.h",
     "agc/gain_map_internal.h",
-    "agc/legacy/analog_agc.c",
-    "agc/legacy/analog_agc.h",
-    "agc/legacy/digital_agc.c",
-    "agc/legacy/digital_agc.h",
-    "agc/legacy/gain_control.h",
     "agc/loudness_histogram.cc",
     "agc/loudness_histogram.h",
     "agc/utility.cc",
@@ -167,6 +162,9 @@ rtc_static_library("audio_processing") {
     "../..:webrtc_common",
     "../audio_coding:isac",
   ]
+  public_deps = [
+    ":audio_processing_c",
+  ]
 
   if (apm_debug_dump) {
     defines += [ "WEBRTC_APM_DEBUG_DUMP=1" ]
@@ -197,28 +195,8 @@ rtc_static_library("audio_processing") {
 
   if (rtc_prefer_fixed_point) {
     defines += [ "WEBRTC_NS_FIXED" ]
-    sources += [
-      "ns/noise_suppression_x.c",
-      "ns/noise_suppression_x.h",
-      "ns/nsx_core.c",
-      "ns/nsx_core.h",
-      "ns/nsx_defines.h",
-    ]
-    if (current_cpu == "mipsel") {
-      sources += [ "ns/nsx_core_mips.c" ]
-    } else {
-      sources += [ "ns/nsx_core_c.c" ]
-    }
   } else {
     defines += [ "WEBRTC_NS_FLOAT" ]
-    sources += [
-      "ns/defines.h",
-      "ns/noise_suppression.c",
-      "ns/noise_suppression.h",
-      "ns/ns_core.c",
-      "ns/ns_core.h",
-      "ns/windows_private.h",
-    ]
   }
 
   if (current_cpu == "x86" || current_cpu == "x64") {
@@ -251,6 +229,47 @@ rtc_static_library("audio_processing") {
   ]
 }
 
+rtc_source_set("audio_processing_c") {
+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
+  sources = [
+    "agc/legacy/analog_agc.c",
+    "agc/legacy/analog_agc.h",
+    "agc/legacy/digital_agc.c",
+    "agc/legacy/digital_agc.h",
+    "agc/legacy/gain_control.h",
+  ]
+
+  if (rtc_prefer_fixed_point) {
+    sources += [
+      "ns/noise_suppression_x.c",
+      "ns/noise_suppression_x.h",
+      "ns/nsx_core.c",
+      "ns/nsx_core.h",
+      "ns/nsx_defines.h",
+    ]
+    if (current_cpu == "mipsel") {
+      sources += [ "ns/nsx_core_mips.c" ]
+    } else {
+      sources += [ "ns/nsx_core_c.c" ]
+    }
+  } else {
+    sources += [
+      "ns/defines.h",
+      "ns/noise_suppression.c",
+      "ns/noise_suppression.h",
+      "ns/ns_core.c",
+      "ns/ns_core.h",
+      "ns/windows_private.h",
+    ]
+  }
+
+  deps = [
+    "../../base:rtc_base_approved",
+    "../../common_audio",
+    "../../system_wrappers",
+  ]
+}
+
 if (rtc_enable_protobuf) {
   proto_library("audioproc_debug_proto") {
     sources = [
@@ -286,7 +305,6 @@ if (rtc_build_with_neon) {
     sources = [
       "aec/aec_core_neon.cc",
       "aecm/aecm_core_neon.cc",
-      "ns/nsx_core_neon.c",
       "utility/ooura_fft_neon.cc",
       "utility/ooura_fft_tables_neon_sse2.h",
     ]
@@ -311,6 +329,9 @@ if (rtc_build_with_neon) {
     deps = [
       "../../common_audio",
     ]
+    public_deps = [
+      ":audio_processing_neon_c",
+    ]
 
     if (apm_debug_dump) {
       defines = [ "WEBRTC_APM_DEBUG_DUMP=1" ]
@@ -318,6 +339,29 @@ if (rtc_build_with_neon) {
       defines = [ "WEBRTC_APM_DEBUG_DUMP=0" ]
     }
   }
+
+  rtc_static_library("audio_processing_neon_c") {
+    sources = [
+      "ns/nsx_core_neon.c",
+    ]
+
+    if (current_cpu != "arm64") {
+      # Enable compilation for the NEON instruction set. This is needed
+      # since //build/config/arm.gni only enables NEON for iOS, not Android.
+      # This provides the same functionality as webrtc/build/arm_neon.gypi.
+      suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
+      cflags = [ "-mfpu=neon" ]
+    }
+
+    # Disable LTO on NEON targets due to compiler bug.
+    # TODO(fdegans): Enable this. See crbug.com/408997.
+    if (rtc_use_lto) {
+      cflags -= [
+        "-flto",
+        "-ffat-lto-objects",
+      ]
+    }
+  }
 }
 
 if (rtc_include_tests) {

[kjellander_webrtc, 2016-12-06 06:41:21]

Rebased, trying again.

https://codereview.webrtc.org/2550563003/diff/120001/webrtc/modules/audio_cod...
File webrtc/modules/audio_coding/BUILD.gn (right):

https://codereview.webrtc.org/2550563003/diff/120001/webrtc/modules/audio_cod...
webrtc/modules/audio_coding/BUILD.gn:808: public_deps = [
On 2016/12/05 11:37:01, hlundin-webrtc wrote:
> Make this a one-liner like you did at line 793 above.

gn format presubmit check wants it this way. I'm not sure why it differs from
the above.

[kjellander_webrtc, 2016-12-06 06:41:27]

The CQ bit was checked by kjellander@webrtc.org

[kjellander_webrtc, 2016-12-06 06:41:28]

The patchset sent to the CQ was uploaded after l-g-t-m from
henrik.lundin@webrtc.org, henrika@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2550563003/#ps180001 (title:
"Rebased")

[commit-bot: I haz the power, 2016-12-06 06:41:31]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2016-12-06 06:47:46]

CQ is committing da patch.

Bot data: {"patchset_id": 180001, "attempt_start_ts": 1481006487510220,
"parent_rev": "6454d64ec6eb7f58fa1528ba0073fbbb2c2100c1", "commit_rev":
"a9d8e7b9bb432bbb04ba4091c9b5f609dc30c8d0"}

[commit-bot: I haz the power, 2016-12-06 06:47:49]

Description was changed from

==========
Split targets mixing .c and .cc sources.

The Bazel build format doesn't support having separate
lists of compilation flags for C and C++; it just has a single
copts list for cc_library:
https://bazel.build/versions/master/docs/be/c-cpp.html#cc_binary.copts

This makes it hard to convert our GN targets to Bazel when there are
compiler warnings that aren't supported for C (like -Woverloaded-virtual
being added in bugs.webrtc.org/6653).

The solution for this is to move all .c files to their own targets
and remove C++-only compiler flags during conversion.

New targets:
//webrtc/common_audio:common_audio_c
//webrtc/common_audio:common_audio_neon_c
//webrtc/modules/audio_coding:g711_c
//webrtc/modules/audio_coding:g722_c
//webrtc/modules/audio_coding:ilbc_c
//webrtc/modules/audio_coding:isac_c
//webrtc/modules/audio_coding:isac_fix_c
//webrtc/modules/audio_coding:isac_test_util
//webrtc/modules/audio_coding:pcm16b_c
//webrtc/modules/audio_coding:webrtc_opusj_c
//webrtc/modules/audio_device:mac_portaudio
//webrtc/modules/audio_procssing:audio_processing_c
//webrtc/modules/audio_procssing:audio_processing_neon_c

This CL also adds a PRESUBMIT.py check that will throw an error
if targets are mixing .c and .cc files, to preven this from regressing.

BUG=webrtc:6653
NOTRY=True
==========

to

==========
Split targets mixing .c and .cc sources.

The Bazel build format doesn't support having separate
lists of compilation flags for C and C++; it just has a single
copts list for cc_library:
https://bazel.build/versions/master/docs/be/c-cpp.html#cc_binary.copts

This makes it hard to convert our GN targets to Bazel when there are
compiler warnings that aren't supported for C (like -Woverloaded-virtual
being added in bugs.webrtc.org/6653).

The solution for this is to move all .c files to their own targets
and remove C++-only compiler flags during conversion.

New targets:
//webrtc/common_audio:common_audio_c
//webrtc/common_audio:common_audio_neon_c
//webrtc/modules/audio_coding:g711_c
//webrtc/modules/audio_coding:g722_c
//webrtc/modules/audio_coding:ilbc_c
//webrtc/modules/audio_coding:isac_c
//webrtc/modules/audio_coding:isac_fix_c
//webrtc/modules/audio_coding:isac_test_util
//webrtc/modules/audio_coding:pcm16b_c
//webrtc/modules/audio_coding:webrtc_opusj_c
//webrtc/modules/audio_device:mac_portaudio
//webrtc/modules/audio_procssing:audio_processing_c
//webrtc/modules/audio_procssing:audio_processing_neon_c

This CL also adds a PRESUBMIT.py check that will throw an error
if targets are mixing .c and .cc files, to preven this from regressing.

BUG=webrtc:6653
NOTRY=True
==========

[commit-bot: I haz the power, 2016-12-06 06:47:50]

Committed patchset #5 (id:180001)

[commit-bot: I haz the power, 2016-12-06 06:47:59]

Description was changed from

==========
Split targets mixing .c and .cc sources.

The Bazel build format doesn't support having separate
lists of compilation flags for C and C++; it just has a single
copts list for cc_library:
https://bazel.build/versions/master/docs/be/c-cpp.html#cc_binary.copts

This makes it hard to convert our GN targets to Bazel when there are
compiler warnings that aren't supported for C (like -Woverloaded-virtual
being added in bugs.webrtc.org/6653).

The solution for this is to move all .c files to their own targets
and remove C++-only compiler flags during conversion.

New targets:
//webrtc/common_audio:common_audio_c
//webrtc/common_audio:common_audio_neon_c
//webrtc/modules/audio_coding:g711_c
//webrtc/modules/audio_coding:g722_c
//webrtc/modules/audio_coding:ilbc_c
//webrtc/modules/audio_coding:isac_c
//webrtc/modules/audio_coding:isac_fix_c
//webrtc/modules/audio_coding:isac_test_util
//webrtc/modules/audio_coding:pcm16b_c
//webrtc/modules/audio_coding:webrtc_opusj_c
//webrtc/modules/audio_device:mac_portaudio
//webrtc/modules/audio_procssing:audio_processing_c
//webrtc/modules/audio_procssing:audio_processing_neon_c

This CL also adds a PRESUBMIT.py check that will throw an error
if targets are mixing .c and .cc files, to preven this from regressing.

BUG=webrtc:6653
NOTRY=True
==========

to

==========
Split targets mixing .c and .cc sources.

The Bazel build format doesn't support having separate
lists of compilation flags for C and C++; it just has a single
copts list for cc_library:
https://bazel.build/versions/master/docs/be/c-cpp.html#cc_binary.copts

This makes it hard to convert our GN targets to Bazel when there are
compiler warnings that aren't supported for C (like -Woverloaded-virtual
being added in bugs.webrtc.org/6653).

The solution for this is to move all .c files to their own targets
and remove C++-only compiler flags during conversion.

New targets:
//webrtc/common_audio:common_audio_c
//webrtc/common_audio:common_audio_neon_c
//webrtc/modules/audio_coding:g711_c
//webrtc/modules/audio_coding:g722_c
//webrtc/modules/audio_coding:ilbc_c
//webrtc/modules/audio_coding:isac_c
//webrtc/modules/audio_coding:isac_fix_c
//webrtc/modules/audio_coding:isac_test_util
//webrtc/modules/audio_coding:pcm16b_c
//webrtc/modules/audio_coding:webrtc_opusj_c
//webrtc/modules/audio_device:mac_portaudio
//webrtc/modules/audio_procssing:audio_processing_c
//webrtc/modules/audio_procssing:audio_processing_neon_c

This CL also adds a PRESUBMIT.py check that will throw an error
if targets are mixing .c and .cc files, to preven this from regressing.

BUG=webrtc:6653
NOTRY=True

Committed: https://crrev.com/7439f973f72536cd9822d4e97b294185a9950b36
Cr-Commit-Position: refs/heads/master@{#15433}
==========

[commit-bot: I haz the power, 2016-12-06 06:48:00]

Patchset 5 (id:??) landed as
https://crrev.com/7439f973f72536cd9822d4e97b294185a9950b36
Cr-Commit-Position: refs/heads/master@{#15433}