commit 18191a6083bd2d8d9ac20922e66fa695bd6ed1c5
author Christopher Ferris <cferris@google.com> Mon Jun 15 22:42:31 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 15 22:42:31 2020 +0000
tree 9c0cd0d57a0d083c60a65dcd2ea06dbbae37b733
parent 86b5e43a3f0f40b8061c25c7b04569a1dacc71a1
parent e5c49d54aa5cfad7da80a1dcc893b6bb92abffb9

Merge "Remove references to libc_scudo."

services/mediacodec/Android.bp

diff --git a/services/mediacodec/Android.bp b/services/mediacodec/Android.bp
index f4c1924..775582a 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 05b7d22..03e1e41 100644
--- a/services/mediaextractor/Android.bp
+++ b/services/mediaextractor/Android.bp
@@ -35,17 +35,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"],
 
     cflags: [

services/mediatranscoding/Android.bp

diff --git a/services/mediatranscoding/Android.bp b/services/mediatranscoding/Android.bp
index b7decbc..bfcf01f 100644
--- a/services/mediatranscoding/Android.bp
+++ b/services/mediatranscoding/Android.bp
@@ -52,18 +52,6 @@
         "mediatranscoding_aidl_interface-ndk_platform",
     ],
 
-    target: {
-        android: {
-            product_variables: {
-                malloc_not_svelte: {
-                    // Scudo increases memory footprint, so only enable on
-                    // non-svelte devices.
-                    shared_libs: ["libc_scudo"],
-                },
-            },
-        },
-    },
-
     init_rc: ["mediatranscoding.rc"],
 
     cflags: [