commit a0e0576f34d536d1f8199edf9133b00b2a6e252a
author Roman Kiryanov <rkir@google.com> Wed May 20 12:40:57 2020 -0700
committer Roman Kiryanov <rkir@google.com> Tue May 26 12:22:09 2020 -0700
tree b49b8399aa01ba4a6579aaef7067a20adbceed55
parent d69ba430b2d56d6cd3d4078415bfc13383a252fc

Retire fallback to audio.primary.goldfish_legacy

Bug: 157158109
Test: boot, check if audio works
Merged-In: Id678e19be1409e88f124ab746395e6289ca734ed
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I279653ecddf49b1c27dd37c33daa2c958f1fcb5f

audio/Android.bp

diff --git a/audio/Android.bp b/audio/Android.bp
index 7d14625..2358f21 100644
--- a/audio/Android.bp
+++ b/audio/Android.bp
@@ -18,7 +18,6 @@
     vendor: true,
     relative_install_path: "hw",
     shared_libs: [
-        "libdl",
         "libcutils",
         "liblog",
         "libtinyalsa",

audio/audio_hw.c

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index d60f8ac..94e567b 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <dlfcn.h>
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -56,13 +55,6 @@
     audio_patch_handle_t next_patch_handle; // Protected by this->lock
 };
 
-/* If not NULL, this is a pointer to the fallback module.
- * This really is the original goldfish audio device /dev/eac which we will use
- * if no alsa devices are detected.
- */
-static struct audio_module*  sFallback;
-static pthread_once_t sFallbackOnce = PTHREAD_ONCE_INIT;
-static void fallback_init(void);
 static int adev_get_mic_mute(const struct audio_hw_device *dev, bool *state);
 static int adev_get_microphones(const audio_hw_device_t *dev,
                                 struct audio_microphone_characteristic_t *mic_array,
@@ -1726,11 +1718,6 @@
     if (strcmp(name, AUDIO_HARDWARE_INTERFACE) != 0)
         return -EINVAL;
 
-    pthread_once(&sFallbackOnce, fallback_init);
-    if (sFallback != NULL) {
-        return sFallback->common.methods->open(&sFallback->common, name, device);
-    }
-
     pthread_mutex_lock(&adev_init_lock);
     if (audio_device_ref_count != 0) {
         *device = &adev->device.common;
@@ -1823,41 +1810,3 @@
         .methods = &hal_module_methods,
     },
 };
-
-/* This function detects whether or not we should be using an alsa audio device
- * or fall back to the legacy goldfish_audio driver.
- */
-static void
-fallback_init(void)
-{
-    void* module;
-
-    FILE *fptr = fopen ("/proc/asound/pcm", "r");
-    if (fptr != NULL) {
-      // asound/pcm is empty if there are no devices
-      int c = fgetc(fptr);
-      fclose(fptr);
-      if (c != EOF) {
-          ALOGD("Emulator host-side ALSA audio emulation detected.");
-          return;
-      }
-    }
-
-    ALOGD("Emulator without host-side ALSA audio emulation detected.");
-#if __LP64__
-    module = dlopen("/vendor/lib64/hw/audio.primary.goldfish_legacy.so",
-                    RTLD_LAZY|RTLD_LOCAL);
-#else
-    module = dlopen("/vendor/lib/hw/audio.primary.goldfish_legacy.so",
-                    RTLD_LAZY|RTLD_LOCAL);
-#endif
-    if (module != NULL) {
-        sFallback = (struct audio_module *)(dlsym(module, HAL_MODULE_INFO_SYM_AS_STR));
-        if (sFallback == NULL) {
-            dlclose(module);
-        }
-    }
-    if (sFallback == NULL) {
-        ALOGE("Could not find legacy fallback module!?");
-    }
-}