commit 2d9777bfbf4f85f28a4721779755603b31eb13b0
author Eric Biggers <ebiggers@google.com> Thu Jul 16 20:30:35 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 16 20:30:35 2020 +0000
tree 73956fa57f580a7c974e842f87569d991dd33860
parent 6e6fc6b8d3225cd77015b3de79f7627916936a04
parent b7a14053c366591fe8ff66d0497fc77f10e929a3

Merge "vold: remove checkEncryption"

Android.bp

diff --git a/Android.bp b/Android.bp
index b69dd5a..2c47859 100644
--- a/Android.bp
+++ b/Android.bp
@@ -146,20 +146,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",
     ],
@@ -177,14 +163,6 @@
 
     srcs: ["main.cpp"],
     static_libs: ["libvold"],
-    product_variables: {
-        arc: {
-            static_libs: [
-                "arc_services_aidl",
-                "libarcobbvolume",
-            ],
-        },
-    },
     init_rc: [
         "vold.rc",
         "wait_for_keymaster.rc",