From 2cadf1ae1be9c6e3f16aaeff93da50750acaa60c Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Wed, 7 Jun 2017 13:29:26 -0700
Subject: Mark libpiex static lib dependencies as vendor_available.

This means the library may be installed in both the
/system and /vendor partitions, if they are used by
system and vendor code respectively.

Test: mm -j64
Bug: 38244611
Change-Id: Ic7604d967be1c96ea297ea4acb67680571e1526a
---
 Android.bp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Android.bp b/Android.bp
index f4a2e98..72dcdc5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,6 @@
 cc_library_static {
     name: "libbinary_parse",
+    vendor_available: true,
     srcs: [
         "src/binary_parse/cached_paged_byte_array.cc",
         "src/binary_parse/range_checked_byte_ptr.cc",
@@ -9,6 +10,7 @@ cc_library_static {
 
 cc_library_static {
     name: "libimage_type_recognition",
+    vendor_available: true,
     srcs: [
         "src/image_type_recognition/image_type_recognition_lite.cc",
     ],
@@ -18,6 +20,7 @@ cc_library_static {
 
 cc_library_static {
     name: "libtiff_directory",
+    vendor_available: true,
     srcs: [
         "src/tiff_directory/tiff_directory.cc",
     ],
-- 
cgit v1.2.3


From 062f53fc7310904a6ff18e226b9af00fd3bab58b Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Mon, 24 Jul 2017 15:19:44 +0900
Subject: Mark the module as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: I63923fcb6c11a2c331606f5b0b71e9f4c4cd7322
---
 Android.bp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Android.bp b/Android.bp
index 72dcdc5..e15f2f6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,6 +31,9 @@ cc_library_static {
 cc_library_shared {
     name: "libpiex",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     srcs: [
         "src/tiff_parser.cc",
         "src/piex.cc",
-- 
cgit v1.2.3