commit 6fb1476a5d4fd431d87b53ceecb43f27c7ea57a3
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 20 11:53:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 20 11:53:04 2021 +0000
tree 2a05f23a22a0d26adea56b3cb45f668a4b5d8407
parent 6b4ff2538808f7a5835ac97b57e127791385ce80
parent edbb8c3ba43a216e743309237826e69ea92eb8cc

Merge "Revert^4 "Customize StubVolume implementation for ARC"" am: 69c97b6d12 am: 500bfa9d4a am: edbb8c3ba4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bd81b674299441369f4e4f0698cf6e528a2c7c0

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 {