From e113d80e03745a22a79290212eefadb406632ee6 Mon Sep 17 00:00:00 2001 From: Pawin Vongmasa Date: Thu, 15 Feb 2018 17:05:08 -0800 Subject: [PATCH] libavservices_minijail: convert to Android.bp Test: make cts -j123 && cts-tradefed run cts-dev -m \ CtsMediaTestCases --compatibility:module-arg \ CtsMediaTestCases:include-annotation:\ android.platform.test.annotations.RequiresDevice Bug: 73507422 Change-Id: I2a8d9eaae764094e18eb045aa0c28425cd9bb19c --- services/minijail/Android.bp | 38 ++++++++++++++++++++++++++++++++++++ services/minijail/Android.mk | 30 ---------------------------- 2 files changed, 38 insertions(+), 30 deletions(-) create mode 100644 services/minijail/Android.bp delete mode 100644 services/minijail/Android.mk diff --git a/services/minijail/Android.bp b/services/minijail/Android.bp new file mode 100644 index 0000000000..07a94cc9a2 --- /dev/null +++ b/services/minijail/Android.bp @@ -0,0 +1,38 @@ +minijail_common_cflags = [ + "-Wall", + "-Werror", +] + +cc_defaults { + name: "libavservices_minijail_defaults", + srcs: ["minijail.cpp"], + cflags: minijail_common_cflags, + shared_libs: [ + "libbase", + "libminijail", + ], +} + +// Small library for media.extractor and media.codec sandboxing. +cc_library_shared { + name: "libavservices_minijail", + defaults: ["libavservices_minijail_defaults"], + export_include_dirs: ["."], +} + +// Small library for media.extractor and media.codec sandboxing. +cc_library_shared { + name: "libavservices_minijail_vendor", + vendor: true, + defaults: ["libavservices_minijail_defaults"], + export_include_dirs: ["."], +} + +// Unit tests. +cc_test { + name: "libavservices_minijail_unittest", + defaults: ["libavservices_minijail_defaults"], + srcs: [ + "av_services_minijail_unittest.cpp", + ], +} diff --git a/services/minijail/Android.mk b/services/minijail/Android.mk deleted file mode 100644 index 67055a834e..0000000000 --- a/services/minijail/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -minijail_common_cflags := -Wall -Werror - -# Small library for media.extractor and media.codec sandboxing. -include $(CLEAR_VARS) -LOCAL_MODULE := libavservices_minijail -LOCAL_SRC_FILES := minijail.cpp -LOCAL_CFLAGS := $(minijail_common_cflags) -LOCAL_SHARED_LIBRARIES := libbase libminijail -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_CFLAGS := $(minijail_common_cflags) -LOCAL_SHARED_LIBRARIES := libbase libminijail -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_SHARED_LIBRARY) - -# Unit tests. -include $(CLEAR_VARS) -LOCAL_MODULE := libavservices_minijail_unittest -LOCAL_SRC_FILES := minijail.cpp av_services_minijail_unittest.cpp -LOCAL_CFLAGS := $(minijail_common_cflags) -LOCAL_SHARED_LIBRARIES := libbase libminijail -include $(BUILD_NATIVE_TEST)