Merge "Use x86-specific source files only for x86 target" am: d5b6db1f70 am: dc4133d150 am: f09973b228 am: 2e4c97c826 am: 7476526b10

Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/1429860

Change-Id: I3f2d72d9853de9b4649da553db80ff6dab9e9d9c

1 files changed, 50 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index 14d638b8af..825e183471 100644
--- a/Android.bp
+++ b/Android.bp
@@ -184,10 +184,16 @@ cc_library_static {
     defaults: ["webrtc_defaults"],
     srcs: [
         "common_audio/third_party/ooura/fft_size_128/ooura_fft.cc",
-        "common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc",
     ],
+    arch: {
+        x86_64: {
+            srcs: [
+                "common_audio/third_party/ooura/fft_size_128/ooura_fft_sse2.cc",
+            ],
+            cflags: ["-msse2"],
+        },
+    },
     host_supported: true,
-    cflags: ["-msse2"],
 }
 
 cc_library_static {
@@ -1504,8 +1510,14 @@ cc_library_static {
         "webrtc_rtc_base__rtc_base_approved",
         "webrtc_system_wrappers__system_wrappers",
         "webrtc_common_audio__common_audio_c",
-        "webrtc_common_audio__common_audio_sse2",
     ],
+    arch: {
+        x86_64: {
+            static_libs: [
+                "webrtc_common_audio__common_audio_sse2",
+            ],
+        },
+    },
 }
 
 cc_library_static {
@@ -1890,8 +1902,14 @@ cc_library_static {
     static_libs: [
         "webrtc_rtc_base__checks",
         "webrtc_rtc_base__rtc_base_approved",
-        "webrtc_common_audio__common_audio_sse2",
     ],
+    arch: {
+        x86_64: {
+            static_libs: [
+                "webrtc_common_audio__common_audio_sse2",
+            ],
+        },
+    },
 }
 
 cc_library_static {
@@ -2815,15 +2833,21 @@ cc_library_static {
         "modules/audio_device/include/test_audio_device.cc",
         "modules/audio_device/audio_device_data_observer.cc",
         "modules/audio_device/audio_device_impl.cc",
-        "modules/audio_device/linux/alsasymboltable_linux.cc",
-        "modules/audio_device/linux/audio_device_alsa_linux.cc",
-        "modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc",
-        "modules/audio_device/linux/latebindingsymboltable_linux.cc",
-        "modules/audio_device/linux/audio_device_pulse_linux.cc",
-        "modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc",
-        "modules/audio_device/linux/pulseaudiosymboltable_linux.cc",
         "modules/audio_device/dummy/file_audio_device_factory.cc",
     ],
+    target: {
+        linux_glibc: {
+            srcs: [
+                "modules/audio_device/linux/alsasymboltable_linux.cc",
+                "modules/audio_device/linux/audio_device_alsa_linux.cc",
+                "modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc",
+                "modules/audio_device/linux/latebindingsymboltable_linux.cc",
+                "modules/audio_device/linux/audio_device_pulse_linux.cc",
+                "modules/audio_device/linux/audio_mixer_manager_pulse_linux.cc",
+                "modules/audio_device/linux/pulseaudiosymboltable_linux.cc",
+            ],
+        },
+    },
     host_supported: true,
     cflags: ["-DWEBRTC_DUMMY_FILE_DEVICES"],
     static_libs: [
@@ -2948,13 +2972,19 @@ cc_library_static {
         "webrtc_modules__module_api",
         "webrtc_rtc_base__rtc_base_approved",
         "webrtc_video__video_rtp_headers",
-        "webrtc_video_processing__video_processing_sse2",
         "webrtc_common_audio__common_audio",
         "webrtc_video__video_frame",
         "webrtc_utility__utility",
         "webrtc_video__video_frame_i420",
         "webrtc_common_video__common_video",
     ],
+    arch: {
+        x86_64: {
+            static_libs: [
+                "webrtc_video_processing__video_processing_sse2",
+            ],
+        },
+    },
 }
 
 cc_library_static {
@@ -5312,7 +5342,6 @@ cc_library_static {
         "webrtc_pacing__interval_budget",
         "webrtc_common_audio__common_audio_c",
         "webrtc_aecm__aecm_core",
-        "webrtc_video_processing__video_processing_sse2",
         "webrtc_agc2__gain_applier",
         "webrtc_task_utils__repeating_task",
         "webrtc_rtc_base__audio_format_to_string",
@@ -5327,7 +5356,6 @@ cc_library_static {
         "webrtc_crypto__options",
         "webrtc_media__rtc_h264_profile_id",
         "webrtc_audio_coding__webrtc_cng",
-        "webrtc_common_audio__common_audio_sse2",
         "webrtc_logging__rtc_event_video",
         "webrtc_common_audio__common_audio",
         "webrtc_call__simulated_network",
@@ -5479,6 +5507,14 @@ cc_library_static {
         "rnnoise_rnn_vad",
         "usrsctplib",
     ],
+    arch: {
+        x86_64: {
+            whole_static_libs: [
+                "webrtc_video_processing__video_processing_sse2",
+                "webrtc_common_audio__common_audio_sse2",
+            ],
+        },
+    },
     srcs: [
         ":webrtc_rtp__dependency_descriptor",
         ":webrtc_audio_processing__rms_level",