commit 4e8b1631b670690a3f3a6e79c09a244a5aad38b6
author Mariia Sandrikova <mariiasand@google.com> Mon Jan 18 18:18:08 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 18 18:18:08 2021 +0000
tree c223185a2e8c77a474fc0d65e2dd9ce03b6649f6
parent 9ae91a47f965b2dd4d8c3ab509a234cf8941e30e
parent 5558a72d0312192b1fae1dc916c18a5f2b5cf51d

Merge "Revert "Customize StubVolume implementation for ARC"" am: 5558a72d03

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1553535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c7f898a1229e2c859a6add61b0024bb95c7d8ce

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 {