Merge "Make libavservices_minijail vendor_available" am: 81bfa6303d am: e8d27a3b75 am: bca2ff7a53

Change-Id: I1ed2151d880b218d2077f6bf56358ac57fd76bd1

services/mediacodec/Android.bp

@@ -15,10 +15,6 @@ cc_binary {
     ],
 
     target: {
-        vendor: {
-            exclude_shared_libs: ["libavservices_minijail"],
-            shared_libs: ["libavservices_minijail_vendor"],
-        },
         android: {
             product_variables: {
                 malloc_not_svelte: {

services/mediacodec/Android.mk

@@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \
     libutils \
     liblog \
     libbase \
-    libavservices_minijail_vendor \
+    libavservices_minijail \
     libcutils \
     libhidlbase \
     libstagefright_omx \

services/minijail/Android.bp

@@ -17,10 +17,14 @@ cc_defaults {
 cc_library_shared {
     name: "libavservices_minijail",
     defaults: ["libavservices_minijail_defaults"],
+    vendor_available: true,
     export_include_dirs: ["."],
 }
 
-// Small library for media.extractor and media.codec sandboxing.
+// By adding "vendor_available: true" to "libavservices_minijail", we don't
+// need to have "libavservices_minijail_vendor" any longer.
+// "libavservices_minijail_vendor" will be removed, once we replace it with
+// "libavservices_minijail" in all vendor modules. (b/146313710)
 cc_library_shared {
     name: "libavservices_minijail_vendor",
     vendor: true,