fs_mgr: Allow adbd disable verity on non-debuggable
This commit is contained in:
parent
e9a28d75c0
commit
e91f183695
|
@ -108,17 +108,10 @@ cc_defaults {
|
||||||
"libfscrypt",
|
"libfscrypt",
|
||||||
"libfstab",
|
"libfstab",
|
||||||
],
|
],
|
||||||
cppflags: [
|
|
||||||
"-DALLOW_ADBD_DISABLE_VERITY=0",
|
|
||||||
],
|
|
||||||
product_variables: {
|
|
||||||
debuggable: {
|
|
||||||
cppflags: [
|
cppflags: [
|
||||||
"-UALLOW_ADBD_DISABLE_VERITY",
|
"-UALLOW_ADBD_DISABLE_VERITY",
|
||||||
"-DALLOW_ADBD_DISABLE_VERITY=1",
|
"-DALLOW_ADBD_DISABLE_VERITY=1",
|
||||||
],
|
],
|
||||||
},
|
|
||||||
},
|
|
||||||
header_libs: [
|
header_libs: [
|
||||||
"libfiemap_headers",
|
"libfiemap_headers",
|
||||||
"libstorage_literals_headers",
|
"libstorage_literals_headers",
|
||||||
|
@ -240,11 +233,6 @@ cc_binary {
|
||||||
srcs: [
|
srcs: [
|
||||||
"fs_mgr_remount.cpp",
|
"fs_mgr_remount.cpp",
|
||||||
],
|
],
|
||||||
cppflags: [
|
|
||||||
"-DALLOW_ADBD_DISABLE_VERITY=0",
|
|
||||||
],
|
|
||||||
product_variables: {
|
|
||||||
debuggable: {
|
|
||||||
cppflags: [
|
cppflags: [
|
||||||
"-UALLOW_ADBD_DISABLE_VERITY",
|
"-UALLOW_ADBD_DISABLE_VERITY",
|
||||||
"-DALLOW_ADBD_DISABLE_VERITY=1",
|
"-DALLOW_ADBD_DISABLE_VERITY=1",
|
||||||
|
@ -252,8 +240,6 @@ cc_binary {
|
||||||
init_rc: [
|
init_rc: [
|
||||||
"clean_scratch_files.rc",
|
"clean_scratch_files.rc",
|
||||||
],
|
],
|
||||||
},
|
|
||||||
},
|
|
||||||
symlinks: [
|
symlinks: [
|
||||||
"clean_scratch_files",
|
"clean_scratch_files",
|
||||||
"disable-verity",
|
"disable-verity",
|
||||||
|
|
Loading…
Reference in New Issue