commit aedae617fec702add64201534a2f514fa31c5965
author Risan <risan@google.com> Mon Nov 27 18:01:35 2017 +0900
committer Risan <risan@google.com> Thu Nov 30 04:24:41 2017 +0000
tree 131f4429dafc714d3e75c937237e27868363cfcb
parent 130a994f4f5fee84f1321409518893186acb71b8

[Vold] Conditional dependency to ARC++ ObbVolume

Test: Compile

Change-Id: Ic6348f7816b28302d45c05a359548a5d034fde24
Bug: 64500663

Android.bp

diff --git a/Android.bp b/Android.bp
index 5941cd9..0377beb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -80,6 +80,11 @@
     },
 }
 
+cc_library_headers {
+    name: "libvold_headers",
+    export_include_dirs: ["."],
+}
+
 // Static library factored out to support testing
 cc_library_static {
     name: "libvold",
@@ -123,6 +128,16 @@
         "model/VolumeBase.cpp",
         "secontext.cpp",
     ],
+    product_variables: {
+        arc: {
+            exclude_srcs: [
+                "model/ObbVolume.cpp",
+            ],
+            static_libs: [
+                "libarcobbvolume",
+            ],
+        },
+    },
 }
 
 cc_binary {
@@ -134,6 +149,13 @@
 
     srcs: ["main.cpp"],
     static_libs: ["libvold"],
+    product_variables: {
+        arc: {
+            static_libs: [
+                "libarcobbvolume",
+            ]
+        },
+    },
     init_rc: ["vold.rc"],
 
     required: [