commit b8efb47a7c618323b15824bfc9700c68f8cb404c
author Colin Cross <ccross@android.com> Sat Dec 02 23:20:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 02 23:20:42 2017 +0000
tree a47b86779b6c4a596a2268f698142a9cad95b481
parent aedae617fec702add64201534a2f514fa31c5965
parent a838863d77c68752a9b96894a487ac2c86907246

Merge "Export AIDL files as a filegroup for framework.jar"

Android.bp

diff --git a/Android.bp b/Android.bp
index db761e4..c4071e5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,6 +78,11 @@
     },
 }
 
+cc_library_headers {
+    name: "libvold_headers",
+    export_include_dirs: ["."],
+}
+
 // Static library factored out to support testing
 cc_library_static {
     name: "libvold",
@@ -121,6 +126,16 @@
         "model/VolumeBase.cpp",
         "secontext.cpp",
     ],
+    product_variables: {
+        arc: {
+            exclude_srcs: [
+                "model/ObbVolume.cpp",
+            ],
+            static_libs: [
+                "libarcobbvolume",
+            ],
+        },
+    },
 }
 
 cc_binary {
@@ -132,6 +147,13 @@
 
     srcs: ["main.cpp"],
     static_libs: ["libvold"],
+    product_variables: {
+        arc: {
+            static_libs: [
+                "libarcobbvolume",
+            ]
+        },
+    },
     init_rc: ["vold.rc"],
 
     required: [