tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3 am: 11757842a3

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

Change-Id: Iec0c1190443f1366a0f105bb3eba3967635ff544
This commit is contained in:
Treehugger Robot 2020-07-16 12:03:40 +00:00 committed by Automerger Merge Worker
commit 9afa4c65d8
1 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Android.bp
View file

@ -148,20 +148,6 @@ cc_library_static {
"model/VolumeBase.cpp", "model/VolumeBase.cpp",
"model/VolumeEncryption.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: [ shared_libs: [
"android.hardware.health.storage@1.0", "android.hardware.health.storage@1.0",
], ],
@ -180,14 +166,6 @@ cc_binary {
srcs: ["main.cpp"], srcs: ["main.cpp"],
static_libs: ["libvold"], static_libs: ["libvold"],
product_variables: {
arc: {
static_libs: [
"arc_services_aidl",
"libarcobbvolume",
],
},
},
init_rc: [ init_rc: [
"vold.rc", "vold.rc",
"wait_for_keymaster.rc", "wait_for_keymaster.rc",