commit 632056e5501f04200b51cced848c6ce94ea2b7d6
author Kris Alder <kalder@google.com> Thu Oct 15 22:23:39 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 15 22:23:39 2020 +0000
tree 18615833df98404a8497b5a08279187632afa81e
parent 7a20375102734c3568050a14d80d43186af3a587
parent 75c40aef1f75867133732b4dc2bfc61f727aa456

Merge changes I3929bfb6,I4ad6fa07

* changes:
  Add host support for AMR Libraries.
  Updated 'preemph.c' and 'q_pulse.c'

apex/testing/Android.bp

diff --git a/apex/testing/Android.bp b/apex/testing/Android.bp
index a04ab3f..d86094e 100644
--- a/apex/testing/Android.bp
+++ b/apex/testing/Android.bp
@@ -17,7 +17,10 @@
     manifest: "test_manifest.json",
     file_contexts: ":com.android.media-file_contexts",
     defaults: ["com.android.media-defaults"],
-    prebuilts: ["sdkinfo_45"],
+    prebuilts: [
+        "sdkinfo_45",
+        "media-linker-config",
+    ],
     installable: false,
 }
 

media/codec2/vndk/C2PlatformStorePluginLoader.cpp

diff --git a/media/codec2/vndk/C2PlatformStorePluginLoader.cpp b/media/codec2/vndk/C2PlatformStorePluginLoader.cpp
index 4c330e5..bee028a 100644
--- a/media/codec2/vndk/C2PlatformStorePluginLoader.cpp
+++ b/media/codec2/vndk/C2PlatformStorePluginLoader.cpp
@@ -33,7 +33,8 @@
 }  // unnamed
 
 C2PlatformStorePluginLoader::C2PlatformStorePluginLoader(const char *libPath)
-    : mCreateBlockPool(nullptr) {
+    : mCreateBlockPool(nullptr),
+      mCreateAllocator(nullptr) {
     mLibHandle = dlopen(libPath, RTLD_NOW | RTLD_NODELETE);
     if (mLibHandle == nullptr) {
         ALOGD("Failed to load library: %s (%s)", libPath, dlerror());