Revert^4 "Customize StubVolume implementation for ARC"
This reverts commit 8ed81fd9ca
.
Reason for revert: Let me try one last time more carefully. According to https://googleplex-android-review.git.corp.google.com/q/%2522customize+stubvolume%2522 - this CL will flow to aosp branches (without vendor images) and 2 branches with vendor images. I have submitted the vendor CL for both branches now (ag/13366009 and ag/13371672). This should not break anything now.
Change-Id: I69aacceabfb70053387a3c156b49e06be65fe6e4
This commit is contained in:
parent
8ed81fd9ca
commit
4ad2048001
1 changed files with 19 additions and 0 deletions
19
Android.bp
19
Android.bp
|
@ -149,6 +149,14 @@ cc_library_static {
|
||||||
"model/VolumeEncryption.cpp",
|
"model/VolumeEncryption.cpp",
|
||||||
],
|
],
|
||||||
product_variables: {
|
product_variables: {
|
||||||
|
arc: {
|
||||||
|
exclude_srcs: [
|
||||||
|
"model/StubVolume.cpp",
|
||||||
|
],
|
||||||
|
static_libs: [
|
||||||
|
"libarcvolume",
|
||||||
|
],
|
||||||
|
},
|
||||||
debuggable: {
|
debuggable: {
|
||||||
cppflags: ["-D__ANDROID_DEBUGGABLE__"],
|
cppflags: ["-D__ANDROID_DEBUGGABLE__"],
|
||||||
},
|
},
|
||||||
|
@ -185,6 +193,17 @@ cc_binary {
|
||||||
shared_libs: [
|
shared_libs: [
|
||||||
"android.hardware.health.storage@1.0",
|
"android.hardware.health.storage@1.0",
|
||||||
],
|
],
|
||||||
|
|
||||||
|
product_variables: {
|
||||||
|
arc: {
|
||||||
|
exclude_srcs: [
|
||||||
|
"model/StubVolume.cpp",
|
||||||
|
],
|
||||||
|
static_libs: [
|
||||||
|
"libarcvolume",
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
cc_binary {
|
cc_binary {
|
||||||
|
|
Loading…
Reference in a new issue