Revert "[Vold] Conditional dependency to ARC++ ObbVolume"
This reverts commit aedae617fe
.
Reason for revert: ArcObbVolume is not needed by ARCVM R and above.
Bug: 157885448
Test: trybot
Change-Id: I16395ac8b6902cedea263f51e306b297d719043f
This commit is contained in:
parent
428ae6e90a
commit
7ebcc2bcfd
1 changed files with 0 additions and 22 deletions
22
Android.bp
22
Android.bp
|
@ -147,20 +147,6 @@ cc_library_static {
|
|||
"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 @@ cc_binary {
|
|||
|
||||
srcs: ["main.cpp"],
|
||||
static_libs: ["libvold"],
|
||||
product_variables: {
|
||||
arc: {
|
||||
static_libs: [
|
||||
"arc_services_aidl",
|
||||
"libarcobbvolume",
|
||||
],
|
||||
},
|
||||
},
|
||||
init_rc: [
|
||||
"vold.rc",
|
||||
"wait_for_keymaster.rc",
|
||||
|
|
Loading…
Reference in a new issue