From a62adc603a01f5f7ae1e7c8b403d69486d3657bb Mon Sep 17 00:00:00 2001
From: Logan Chien <loganchien@google.com>
Date: Tue, 21 Nov 2017 20:32:45 +0800
Subject: Mark libminijail as VNDK

This commit marks libminijail as a VNDK library so that the vendor
variant can be installed into /system/lib[64]/vndk instead of
/vendor/lib[64].

This library was not a VNDK library in Android O because its Android.mk
hasn't been converted to Android.bp at the time.  Thus, we were asking
vendors to use libminijail_vendor instead and omx implementation has to
use libavservice_minijail_vendor.  Since Android.mk has been converted
to Android.bp, it would be great to mark this library as VNDK library so
that libminijail can be updated through system-only OTAs.

Bug: 63866913
Test: Build sailfish and libminijail.so should be installed into
/system/lib[64]/vndk/libminijail.so instead of
/vendor/lib[64]/libminijail.so.

Change-Id: Ia03d2ec7ae43f3a316815087fd192e0b8ab0456f
Merged-In: Ia03d2ec7ae43f3a316815087fd192e0b8ab0456f
(cherry picked from commit 9460f604ec32e8fc78d65ace02d025e249aa4b14)
---
 Android.bp   |  5 +++++
 CleanSpec.mk | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 CleanSpec.mk

diff --git a/Android.bp b/Android.bp
index c7efae5..a52439e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -114,7 +114,12 @@ cc_library_static {
 // =========================================================
 cc_library {
     name: "libminijail",
+
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
+
     defaults: ["libminijail_flags"],
 
     srcs: libminijailSrcFiles,
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..235a2b7
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,51 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -exec rm -f {} \;)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/libminijail.so)
-- 
cgit v1.2.3