commit 091671cc2f7e098410b27a8afeb167fd01966a14
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 27 03:53:01 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 27 03:53:01 2020 +0000
tree ca4dc40b5fb772487ab0e8da4a4a57e3738c7639
parent ecca3af1d29c2334e37ed57ca948c6798c50dc5a
parent 620a40bb16e65eb783205dfbdf1eda7c9bd09aab

Merge "libstagefright_foundation_defaults: Add host support" am: 81ad94b0d9 am: d061735efd am: 4735f4d7f5 am: 620a40bb16

Change-Id: I73dba4d3d3ad518a5e63cb119a53290970217ad2

media/libstagefright/foundation/ALooperRoster.cpp

diff --git a/media/libstagefright/foundation/ALooperRoster.cpp b/media/libstagefright/foundation/ALooperRoster.cpp
index 8a7c3eb..0a4e598 100644
--- a/media/libstagefright/foundation/ALooperRoster.cpp
+++ b/media/libstagefright/foundation/ALooperRoster.cpp
@@ -166,7 +166,7 @@
         }
         s.append("\n");
     }
-    write(fd, s.string(), s.size());
+    (void)write(fd, s.string(), s.size());
 }
 
 }  // namespace android

media/libstagefright/foundation/AString.cpp

diff --git a/media/libstagefright/foundation/AString.cpp b/media/libstagefright/foundation/AString.cpp
index 4bd186c..8722e14 100644
--- a/media/libstagefright/foundation/AString.cpp
+++ b/media/libstagefright/foundation/AString.cpp
@@ -387,10 +387,14 @@
     va_start(ap, format);
 
     char *buffer;
-    vasprintf(&buffer, format, ap);
+    int bufferSize = vasprintf(&buffer, format, ap);
 
     va_end(ap);
 
+    if(bufferSize < 0) {
+        return AString();
+    }
+
     AString result(buffer);
 
     free(buffer);

media/libstagefright/foundation/Android.bp

diff --git a/media/libstagefright/foundation/Android.bp b/media/libstagefright/foundation/Android.bp
index 61b209c..ebf1035 100644
--- a/media/libstagefright/foundation/Android.bp
+++ b/media/libstagefright/foundation/Android.bp
@@ -12,6 +12,7 @@
     vndk: {
         enabled: true,
     },
+    host_supported: true,
     double_loadable: true,
     include_dirs: [
         "frameworks/av/include",
@@ -85,6 +86,9 @@
                 "-DNO_IMEMORY",
             ],
         },
+        darwin: {
+            enabled: false,
+        },
     },
 
     clang: true,