Merge "Revert "Revert "Revert "Customize StubVolume implementation for ARC"""" am: 922af320dd am: 4e77967775

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c05660893db14945a61d6f378d28a2249f29b75
This commit is contained in:
Maurice Lam 2021-01-19 22:06:02 +00:00 committed by Automerger Merge Worker
commit c2a372231f

View file

@ -149,14 +149,6 @@ cc_library_static {
"model/VolumeEncryption.cpp",
],
product_variables: {
arc: {
exclude_srcs: [
"model/StubVolume.cpp",
],
static_libs: [
"libarcvolume",
],
},
debuggable: {
cppflags: ["-D__ANDROID_DEBUGGABLE__"],
},
@ -193,17 +185,6 @@ cc_binary {
shared_libs: [
"android.hardware.health.storage@1.0",
],
product_variables: {
arc: {
exclude_srcs: [
"model/StubVolume.cpp",
],
static_libs: [
"libarcvolume",
],
},
},
}
cc_binary {