commit 4ad2048001f4722c979cd2a60cdcd3aaf110e46a
author Risan <risan@google.com> Wed Jan 20 05:53:15 2021 +0000
committer Risan <risan@google.com> Wed Jan 20 10:33:18 2021 +0000
tree 6941590413d30a0f8ffb173889d989e844b732a9
parent 8ed81fd9ca4e58231e71a5c59c839d7ba5ca4b3f

Revert^4 "Customize StubVolume implementation for ARC"

This reverts commit 8ed81fd9ca4e58231e71a5c59c839d7ba5ca4b3f.

Reason for revert: Let me try one last time more carefully. According to https://googleplex-android-review.git.corp.google.com/q/%2522customize+stubvolume%2522 - this CL will flow to aosp branches (without vendor images) and 2 branches with vendor images. I have submitted the vendor CL for both branches now (ag/13366009 and ag/13371672). This should not break anything now.

Change-Id: I69aacceabfb70053387a3c156b49e06be65fe6e4

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 {