commit 5558a72d0312192b1fae1dc916c18a5f2b5cf51d
author Mariia Sandrikova <mariiasand@google.com> Mon Jan 18 18:00:07 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 18 18:00:07 2021 +0000
tree c223185a2e8c77a474fc0d65e2dd9ce03b6649f6
parent 502c283c22e455c93aba311b6c986013ff223902
parent 0cf77b025dd7e9fd92ddf3259de800c19e5db73d

Merge "Revert "Customize StubVolume implementation for ARC""

Android.bp

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