commit 3164c0a2385c9e27f21a6de346de15216d652ec7
author Risan <risan@google.com> Tue Jan 19 02:24:38 2021 +0000
committer Risan <risan@google.com> Tue Jan 19 02:24:38 2021 +0000
tree 6941590413d30a0f8ffb173889d989e844b732a9
parent 0cf77b025dd7e9fd92ddf3259de800c19e5db73d

Revert "Revert "Customize StubVolume implementation for ARC""

This reverts commit 0cf77b025dd7e9fd92ddf3259de800c19e5db73d.

Reason for revert: The requird libarcvolume has been submitted to master (ag/13366009)

Change-Id: I86fada53aad2ec5faa497a9bcbce5435c35d040e

Android.bp

diff --git a/Android.bp b/Android.bp
index 1c0ed17..e8344da 100644
--- a/Android.bp
+++ b/Android.bp
@@ -149,6 +149,14 @@
         "model/VolumeEncryption.cpp",
     ],
     product_variables: {
+        arc: {
+            exclude_srcs: [
+                "model/StubVolume.cpp",
+            ],
+            static_libs: [
+                "libarcvolume",
+            ],
+        },
         debuggable: {
             cppflags: ["-D__ANDROID_DEBUGGABLE__"],
         },
@@ -185,6 +193,17 @@
     shared_libs: [
         "android.hardware.health.storage@1.0",
     ],
+
+    product_variables: {
+        arc: {
+            exclude_srcs: [
+                "model/StubVolume.cpp",
+            ],
+            static_libs: [
+                "libarcvolume",
+            ],
+        },
+	},
 }
 
 cc_binary {