commit 053359a38a8b4993732e3283990594e2b92d9426
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 19 21:17:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 19 21:17:20 2017 +0000
tree 6a4526893fffbad05513a2fab1211551de364a31
parent da66f7974832e69284e6630dd3126770c18d7d80
parent 009578c1aef5f6fe5fa064edf15dc888d32526c0

Merge "OMX Hal: depend on libavservices_minijail_vendor." into oc-dr1-dev

services/mediacodec/Android.mk

diff --git a/services/mediacodec/Android.mk b/services/mediacodec/Android.mk
index d3df52c..39a83c7 100644
--- a/services/mediacodec/Android.mk
+++ b/services/mediacodec/Android.mk
@@ -30,7 +30,7 @@
     libgui \
     liblog \
     libbase \
-    libavservices_minijail \
+    libavservices_minijail_vendor \
     libcutils \
     libhwbinder \
     libhidltransport \

services/minijail/Android.mk

diff --git a/services/minijail/Android.mk b/services/minijail/Android.mk
index 3e63f97..b6fcacc 100644
--- a/services/minijail/Android.mk
+++ b/services/minijail/Android.mk
@@ -8,6 +8,14 @@
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 include $(BUILD_SHARED_LIBRARY)
 
+# Small library for media.extractor and media.codec sandboxing.
+include $(CLEAR_VARS)
+LOCAL_MODULE := libavservices_minijail_vendor
+LOCAL_VENDOR_MODULE := true
+LOCAL_SRC_FILES := minijail.cpp
+LOCAL_SHARED_LIBRARIES := libbase libminijail_vendor
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+include $(BUILD_SHARED_LIBRARY)
 
 # Unit tests.
 include $(CLEAR_VARS)