Merge "Benchmark: add Encoder"
diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 8b97fbe..8de6381 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -1,10 +1,3 @@
-cc_defaults {
- name: "libmedia_defaults",
- include_dirs: [
- "bionic/libc/private",
- ],
-}
-
cc_library_headers {
name: "libmedia_headers",
vendor_available: true,
@@ -227,8 +220,6 @@
cc_library {
name: "libmedia",
- defaults: [ "libmedia_defaults" ],
-
srcs: [
"IDataSource.cpp",
"BufferingSettings.cpp",
@@ -274,6 +265,7 @@
},
header_libs: [
+ "bionic_libc_platform_headers",
"libstagefright_headers",
"media_ndk_headers",
],
@@ -339,8 +331,6 @@
cc_library_static {
name: "libmedia_player2_util",
- defaults: [ "libmedia_defaults" ],
-
srcs: [
"AudioParameter.cpp",
"BufferingSettings.cpp",
diff --git a/media/libmedia/MediaUtils.cpp b/media/libmedia/MediaUtils.cpp
index 31972fa..2efb30e 100644
--- a/media/libmedia/MediaUtils.cpp
+++ b/media/libmedia/MediaUtils.cpp
@@ -22,7 +22,7 @@
#include <sys/resource.h>
#include <unistd.h>
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
#include "MediaUtils.h"
diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index 9170805..353044c8 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -220,7 +220,7 @@
],
header_libs:[
- "libnativeloader-dummy-headers",
+ "libnativeloader-headers",
"libstagefright_xmlparser_headers",
"media_ndk_headers",
],
diff --git a/media/libstagefright/foundation/AString.cpp b/media/libstagefright/foundation/AString.cpp
index fb51cc5..a8adff5 100644
--- a/media/libstagefright/foundation/AString.cpp
+++ b/media/libstagefright/foundation/AString.cpp
@@ -365,8 +365,6 @@
// static
AString AString::FromParcel(const Parcel &parcel) {
size_t size = static_cast<size_t>(parcel.readInt32());
- // The static analyzer incorrectly reports a false-positive here in c++17.
- // https://bugs.llvm.org/show_bug.cgi?id=38176 . NOLINTNEXTLINE
return AString(static_cast<const char *>(parcel.readInplace(size)), size);
}
diff --git a/media/utils/Android.bp b/media/utils/Android.bp
index 0ed92f7..2dbc476 100644
--- a/media/utils/Android.bp
+++ b/media/utils/Android.bp
@@ -45,10 +45,10 @@
"-Werror",
],
- include_dirs: [
- // For android_mallopt definitions.
- "bionic/libc/private"
+ header_libs: [
+ "bionic_libc_platform_headers",
],
+
local_include_dirs: ["include"],
export_include_dirs: ["include"],
}
diff --git a/media/utils/MemoryLeakTrackUtil.cpp b/media/utils/MemoryLeakTrackUtil.cpp
index 2988b52..6166859 100644
--- a/media/utils/MemoryLeakTrackUtil.cpp
+++ b/media/utils/MemoryLeakTrackUtil.cpp
@@ -22,7 +22,7 @@
#include "media/MemoryLeakTrackUtil.h"
#include <sstream>
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
/*
* The code here originally resided in MediaPlayerService.cpp