From f85de06d28e719f3233376f92fa585f72ccfee48 Mon Sep 17 00:00:00 2001
From: Nan Zhang <nanzhang@google.com>
Date: Tue, 28 Nov 2017 17:25:25 -0800
Subject: Convert libbrillo-minijail target to Soong

libbrillo-minijail is needed by system/tpm/trunks.

Bug: None
Test: `make checkbuild`
Change-Id: Iab754fdbdace84e89a88deefb3c15c4178b78218
---
 Android.bp | 17 +++++++++++++++++
 Android.mk | 23 -----------------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/Android.bp b/Android.bp
index 52ae4f5..5a6c614 100644
--- a/Android.bp
+++ b/Android.bp
@@ -165,6 +165,23 @@ cc_library_shared {
     export_include_dirs: ["."],
 }
 
+// Shared minijail library for target
+// ========================================================
+cc_library_shared {
+    name: "libbrillo-minijail",
+    srcs: [
+        "brillo/minijail/minijail.cc",
+    ],
+    shared_libs: [
+        "libchrome",
+        "libbrillo",
+        "libminijail",
+    ],
+    static_libs: ["libgtest_prod"],
+    cflags: libbrillo_CFLAGS,
+    export_include_dirs: ["."],
+}
+
 // Shared and static stream library for target and host
 // ========================================================
 cc_library {
diff --git a/Android.mk b/Android.mk
index e064610..38c3a3b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,29 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Default values for the USE flags. Override these USE flags from your product
-# by setting BRILLO_USE_* values. Note that we define local variables like
-# local_use_* to prevent leaking our default setting for other packages.
-
-LOCAL_PATH := $(call my-dir)
-
-libbrillo_CFLAGS := \
-    -Wall \
-    -Werror
-
-# Shared minijail library for target
-# ========================================================
-include $(CLEAR_VARS)
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_MODULE := libbrillo-minijail
-LOCAL_SRC_FILES := brillo/minijail/minijail.cc
-LOCAL_SHARED_LIBRARIES := libchrome libbrillo libminijail
-LOCAL_STATIC_LIBRARIES := libgtest_prod
-LOCAL_CFLAGS := $(libbrillo_CFLAGS)
-LOCAL_CLANG := true
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-include $(BUILD_SHARED_LIBRARY)
-
 # Run unit tests on target
 # ========================================================
 # We su shell because process tests try setting "illegal"
-- 
cgit v1.2.3