Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1320919 Change-Id: I6fb0ca30c54791549923099c1acf74667e06ae5b
This commit is contained in:
commit
11757842a3
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