commit 7ebcc2bcfde2cf6713e2975224034b06ba0943d8
author Satoshi Niwa <niwa@google.com> Mon Jun 01 21:03:36 2020 +0900
committer Satoshi Niwa <niwa@google.com> Mon Jul 13 05:07:18 2020 +0000
tree 02f6fe0c74d95c46c03516a4bad95e0e670e8ae5
parent 428ae6e90a425a46c634fb103abb4be0f24bd74f

Revert "[Vold] Conditional dependency to ARC++ ObbVolume"

This reverts commit aedae617fec702add64201534a2f514fa31c5965.

Reason for revert: ArcObbVolume is not needed by ARCVM R and above.

Bug: 157885448
Test: trybot
Change-Id: I16395ac8b6902cedea263f51e306b297d719043f

Android.bp

diff --git a/Android.bp b/Android.bp
index 0ffc8f9..b5bda3a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,20 +147,6 @@
         "model/VolumeBase.cpp",
         "model/VolumeEncryption.cpp",
     ],
-    product_variables: {
-        arc: {
-            exclude_srcs: [
-                "model/ObbVolume.cpp",
-            ],
-            static_libs: [
-                "arc_services_aidl",
-                "libarcobbvolume",
-            ],
-        },
-        debuggable: {
-            cppflags: ["-D__ANDROID_DEBUGGABLE__"],
-        },
-    },
     shared_libs: [
         "android.hardware.health.storage@1.0",
     ],
@@ -178,14 +164,6 @@
 
     srcs: ["main.cpp"],
     static_libs: ["libvold"],
-    product_variables: {
-        arc: {
-            static_libs: [
-                "arc_services_aidl",
-                "libarcobbvolume",
-            ],
-        },
-    },
     init_rc: [
         "vold.rc",
         "wait_for_keymaster.rc",