commit 9afa4c65d86a50dfc7fd5aee83ac6053f0ca3b39
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 16 12:03:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 16 12:03:40 2020 +0000
tree d8ce4fb9930cd5e89d3f38f654d5822246b33acd
parent 09b9cae24dddc74e297c9d8b9055a19d6922691d
parent 11757842a341705311a6a9a792a51d692f67bce8

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3 am: 11757842a3

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

Change-Id: Iec0c1190443f1366a0f105bb3eba3967635ff544

Android.bp

diff --git a/Android.bp b/Android.bp
index b033647..e1bd571 100644
--- a/Android.bp
+++ b/Android.bp
@@ -148,20 +148,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",
     ],
@@ -180,14 +166,6 @@
 
     srcs: ["main.cpp"],
     static_libs: ["libvold"],
-    product_variables: {
-        arc: {
-            static_libs: [
-                "arc_services_aidl",
-                "libarcobbvolume",
-            ],
-        },
-    },
     init_rc: [
         "vold.rc",
         "wait_for_keymaster.rc",