diff options
| author | Tom Cherry <tomcherry@google.com> | 2019-02-20 12:51:33 -0800 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2019-02-20 12:52:02 -0800 |
| commit | 15800946e09f7272fe487cbebb4c9e009cb59811 (patch) | |
| tree | 0e86bebd895d26917fa9a76aea7316e52c9150ce /fs_mgr/fs_mgr.cpp | |
| parent | fe1f7017617d1e8b4b68cac15bf659adc88790b2 (diff) | |
| download | system_core-15800946e09f7272fe487cbebb4c9e009cb59811.tar.gz system_core-15800946e09f7272fe487cbebb4c9e009cb59811.tar.bz2 system_core-15800946e09f7272fe487cbebb4c9e009cb59811.zip | |
__android_log_is_debuggable() shouldn't be an apex symbol
Remove a superfluous check in fs_mgr, since those return values are
already impossible for a non-debuggable build. Replace a one time
call to __android_log_is_debuggable(), since there's no reason to
cache the value or use this symbol.
Test: build
Change-Id: Icd4bef7b616c49d304303747388d7e3018c6fcfc
Diffstat (limited to 'fs_mgr/fs_mgr.cpp')
| -rw-r--r-- | fs_mgr/fs_mgr.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index b69e773e4..0c904c46e 100644 --- a/fs_mgr/fs_mgr.cpp +++ b/fs_mgr/fs_mgr.cpp @@ -1098,9 +1098,7 @@ int fs_mgr_mount_all(Fstab* fstab, int mount_mode) { } } else if ((current_entry.fs_mgr_flags.verify)) { int rc = fs_mgr_setup_verity(¤t_entry, true); - if (__android_log_is_debuggable() && - (rc == FS_MGR_SETUP_VERITY_DISABLED || - rc == FS_MGR_SETUP_VERITY_SKIPPED)) { + if (rc == FS_MGR_SETUP_VERITY_DISABLED || rc == FS_MGR_SETUP_VERITY_SKIPPED) { LINFO << "Verity disabled"; } else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) { LERROR << "Could not set up verified partition, skipping!"; @@ -1331,9 +1329,7 @@ static int fs_mgr_do_mount_helper(Fstab* fstab, const std::string& n_name, } } else if (fstab_entry.fs_mgr_flags.verify) { int rc = fs_mgr_setup_verity(&fstab_entry, true); - if (__android_log_is_debuggable() && - (rc == FS_MGR_SETUP_VERITY_DISABLED || - rc == FS_MGR_SETUP_VERITY_SKIPPED)) { + if (rc == FS_MGR_SETUP_VERITY_DISABLED || rc == FS_MGR_SETUP_VERITY_SKIPPED) { LINFO << "Verity disabled"; } else if (rc != FS_MGR_SETUP_VERITY_SUCCESS) { LERROR << "Could not set up verified partition, skipping!"; |