Merge "Revert "Revert "Customize StubVolume implementation for ARC""" am: a8ebbe77a0 am: 1932006a8f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33ba2498088d4f307d35eb3460fb84b9ddbfaca6
This commit is contained in:
Risan 2021-01-19 12:41:15 +00:00 committed by Automerger Merge Worker
commit 3b4adee2f0

View file

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