commit a80509cafd9b132999fe28b3a143933dfb7f5cbb
author Christopher Ferris <cferris@google.com> Wed Jun 24 03:16:47 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 24 03:16:47 2020 +0000
tree db3dbe62e8d690dbaf9cb772ac8a804756b0499c
parent 4b34c69843b35802fa07ab52bd0d1a2ae15c67d5
parent bc2823763f293e5a33442f7fd8c8b05b12d35883

Merge "Remove references to libc_scudo."

services/mediacodec/Android.bp

diff --git a/services/mediacodec/Android.bp b/services/mediacodec/Android.bp
index f603b85..394bd07 100644
--- a/services/mediacodec/Android.bp
+++ b/services/mediacodec/Android.bp
@@ -15,18 +15,6 @@
         "libmedia_codecserviceregistrant",
     ],
 
-    target: {
-        android: {
-            product_variables: {
-                malloc_not_svelte: {
-                    // Scudo increases memory footprint, so only enable on
-                    // non-svelte devices.
-                    shared_libs: ["libc_scudo"],
-                },
-            },
-        },
-    },
-
     header_libs: [
         "libmedia_headers",
     ],

services/mediaextractor/Android.bp

diff --git a/services/mediaextractor/Android.bp b/services/mediaextractor/Android.bp
index 15d30ce..da68736 100644
--- a/services/mediaextractor/Android.bp
+++ b/services/mediaextractor/Android.bp
@@ -29,17 +29,6 @@
         "liblog",
         "libavservices_minijail",
     ],
-    target: {
-        android: {
-            product_variables: {
-                malloc_not_svelte: {
-                    // Scudo increases memory footprint, so only enable on
-                    // non-svelte devices.
-                    shared_libs: ["libc_scudo"],
-                },
-            },
-        },
-    },
     init_rc: ["mediaextractor.rc"],
 
     include_dirs: ["frameworks/av/media/libmedia"],