From 4ca9f1cebc604fd20ac4fd971738ecd74ae69b77 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 25 Sep 2017 17:08:49 -0700 Subject: [PATCH] Convert to Android.bp; rename libminijail_vendor libminijail_vendor is now just libminijail, now that it's been converted to Soong. See build/soong/README.md for more information about Soong. Test: mmma hardware/interfaces/minijail Change-Id: Iefa49fbbd96c1ae18c5da4367e2c9135d8c25a5c --- minijail/Android.bp | 12 ++++++++++++ minijail/Android.mk | 14 -------------- 2 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 minijail/Android.bp delete mode 100644 minijail/Android.mk diff --git a/minijail/Android.bp b/minijail/Android.bp new file mode 100644 index 0000000000..b95f0298bc --- /dev/null +++ b/minijail/Android.bp @@ -0,0 +1,12 @@ +cc_library_shared { + name: "libhwminijail", + vendor: true, + export_include_dirs: ["include"], + + srcs: ["HardwareMinijail.cpp"], + + shared_libs: [ + "libbase", + "libminijail", + ], +} diff --git a/minijail/Android.mk b/minijail/Android.mk deleted file mode 100644 index 272bb0ef1f..0000000000 --- a/minijail/Android.mk +++ /dev/null @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := libhwminijail -LOCAL_PROPRIETARY_MODULE := true -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -LOCAL_SRC_FILES := HardwareMinijail.cpp - -LOCAL_SHARED_LIBRARIES := \ - libbase \ - libminijail_vendor - -include $(BUILD_SHARED_LIBRARY)