From 9a319f01f8768a1342c3f1c684f04c112a51f45c Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 4 Jan 2018 13:19:11 -0800 Subject: Merge libmounts into libotautil. Export its header (mounts.h) from there, and drop the dot dot dependency from libupdater / updater. Test: mmma bootable/recovery Test: recovery_component_test Change-Id: Ic26a6b9b78a34dbe1f178b138f3abaafffbec44c --- Android.bp | 16 -------- Android.mk | 1 - mounts.cpp | 82 ---------------------------------------- mounts.h | 28 -------------- otautil/Android.bp | 9 +++++ otautil/include/otautil/mounts.h | 25 ++++++++++++ otautil/mounts.cpp | 82 ++++++++++++++++++++++++++++++++++++++++ roots.cpp | 2 +- tests/Android.mk | 1 - updater/Android.mk | 11 ++---- updater/install.cpp | 2 +- 11 files changed, 122 insertions(+), 137 deletions(-) delete mode 100644 mounts.cpp delete mode 100644 mounts.h create mode 100644 otautil/include/otautil/mounts.h create mode 100644 otautil/mounts.cpp diff --git a/Android.bp b/Android.bp index 6c04504ea..9ad961d5b 100644 --- a/Android.bp +++ b/Android.bp @@ -60,22 +60,6 @@ cc_library_static { ], } -cc_library_static { - name: "libmounts", - - defaults: [ - "recovery_defaults", - ], - - srcs: [ - "mounts.cpp", - ], - - static_libs: [ - "libbase", - ], -} - cc_library_static { name: "libverifier", diff --git a/Android.mk b/Android.mk index eef4a020f..f2fa6fb3c 100644 --- a/Android.mk +++ b/Android.mk @@ -162,7 +162,6 @@ LOCAL_STATIC_LIBRARIES := \ libsparse \ libziparchive \ libotautil \ - libmounts \ libminadbd \ libasyncio \ libfusesideload \ diff --git a/mounts.cpp b/mounts.cpp deleted file mode 100644 index 76fa65739..000000000 --- a/mounts.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2007 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "mounts.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -struct MountedVolume { - std::string device; - std::string mount_point; - std::string filesystem; - std::string flags; -}; - -std::vector g_mounts_state; - -bool scan_mounted_volumes() { - for (size_t i = 0; i < g_mounts_state.size(); ++i) { - delete g_mounts_state[i]; - } - g_mounts_state.clear(); - - // Open and read mount table entries. - FILE* fp = setmntent("/proc/mounts", "re"); - if (fp == NULL) { - return false; - } - mntent* e; - while ((e = getmntent(fp)) != NULL) { - MountedVolume* v = new MountedVolume; - v->device = e->mnt_fsname; - v->mount_point = e->mnt_dir; - v->filesystem = e->mnt_type; - v->flags = e->mnt_opts; - g_mounts_state.push_back(v); - } - endmntent(fp); - return true; -} - -MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point) { - for (size_t i = 0; i < g_mounts_state.size(); ++i) { - if (g_mounts_state[i]->mount_point == mount_point) return g_mounts_state[i]; - } - return nullptr; -} - -int unmount_mounted_volume(MountedVolume* volume) { - // Intentionally pass the empty string to umount if the caller tries to unmount a volume they - // already unmounted using this function. - std::string mount_point = volume->mount_point; - volume->mount_point.clear(); - int result = umount(mount_point.c_str()); - if (result == -1) { - PLOG(WARNING) << "Failed to umount " << mount_point; - } - return result; -} diff --git a/mounts.h b/mounts.h deleted file mode 100644 index 0de1ebd0a..000000000 --- a/mounts.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2007 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef MOUNTS_H_ -#define MOUNTS_H_ - -struct MountedVolume; - -bool scan_mounted_volumes(); - -MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point); - -int unmount_mounted_volume(MountedVolume* volume); - -#endif diff --git a/otautil/Android.bp b/otautil/Android.bp index 958f98b76..45d119cb5 100644 --- a/otautil/Android.bp +++ b/otautil/Android.bp @@ -21,6 +21,7 @@ cc_library_static { "SysUtil.cpp", "DirUtil.cpp", "ThermalUtil.cpp", + "mounts.cpp", "paths.cpp", "rangeset.cpp", ], @@ -39,4 +40,12 @@ cc_library_static { export_include_dirs: [ "include", ], + + target: { + darwin: { + exclude_srcs: [ + "mounts.cpp", + ], + }, + }, } diff --git a/otautil/include/otautil/mounts.h b/otautil/include/otautil/mounts.h new file mode 100644 index 000000000..6786c8d2e --- /dev/null +++ b/otautil/include/otautil/mounts.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2007 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +struct MountedVolume; + +bool scan_mounted_volumes(); + +MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point); + +int unmount_mounted_volume(MountedVolume* volume); diff --git a/otautil/mounts.cpp b/otautil/mounts.cpp new file mode 100644 index 000000000..951311bf3 --- /dev/null +++ b/otautil/mounts.cpp @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2007 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "otautil/mounts.h" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +struct MountedVolume { + std::string device; + std::string mount_point; + std::string filesystem; + std::string flags; +}; + +static std::vector g_mounts_state; + +bool scan_mounted_volumes() { + for (size_t i = 0; i < g_mounts_state.size(); ++i) { + delete g_mounts_state[i]; + } + g_mounts_state.clear(); + + // Open and read mount table entries. + FILE* fp = setmntent("/proc/mounts", "re"); + if (fp == NULL) { + return false; + } + mntent* e; + while ((e = getmntent(fp)) != NULL) { + MountedVolume* v = new MountedVolume; + v->device = e->mnt_fsname; + v->mount_point = e->mnt_dir; + v->filesystem = e->mnt_type; + v->flags = e->mnt_opts; + g_mounts_state.push_back(v); + } + endmntent(fp); + return true; +} + +MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point) { + for (size_t i = 0; i < g_mounts_state.size(); ++i) { + if (g_mounts_state[i]->mount_point == mount_point) return g_mounts_state[i]; + } + return nullptr; +} + +int unmount_mounted_volume(MountedVolume* volume) { + // Intentionally pass the empty string to umount if the caller tries to unmount a volume they + // already unmounted using this function. + std::string mount_point = volume->mount_point; + volume->mount_point.clear(); + int result = umount(mount_point.c_str()); + if (result == -1) { + PLOG(WARNING) << "Failed to umount " << mount_point; + } + return result; +} diff --git a/roots.cpp b/roots.cpp index 8907bbd9b..26ebf1fbe 100644 --- a/roots.cpp +++ b/roots.cpp @@ -39,7 +39,7 @@ #include #include -#include "mounts.h" +#include "otautil/mounts.h" static struct fstab* fstab = nullptr; diff --git a/tests/Android.mk b/tests/Android.mk index fd4497858..538ae63e2 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -117,7 +117,6 @@ LOCAL_STATIC_LIBRARIES := \ libbootloader_message \ libverifier \ libotautil \ - libmounts \ libupdate_verifier \ libdivsufsort \ libdivsufsort64 \ diff --git a/updater/Android.mk b/updater/Android.mk index 6f334ee18..476266400 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -24,14 +24,13 @@ tune2fs_static_libraries := \ updater_common_static_libraries := \ libapplypatch \ - libbspatch \ + libbootloader_message \ libedify \ - libziparchive \ + libotafault \ libotautil \ - libbootloader_message \ + libbspatch \ + libziparchive \ libutils \ - libmounts \ - libotafault \ libext4_utils \ libfec \ libfec_rs \ @@ -61,7 +60,6 @@ LOCAL_SRC_FILES := \ blockimg.cpp LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/include \ external/e2fsprogs/misc @@ -87,7 +85,6 @@ LOCAL_SRC_FILES := \ updater.cpp LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/.. \ $(LOCAL_PATH)/include LOCAL_CFLAGS := \ diff --git a/updater/install.cpp b/updater/install.cpp index 6732ab897..5623c3379 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -57,10 +57,10 @@ #include #include "edify/expr.h" -#include "mounts.h" #include "otafault/ota_io.h" #include "otautil/DirUtil.h" #include "otautil/error_code.h" +#include "otautil/mounts.h" #include "otautil/print_sha1.h" #include "updater/updater.h" -- cgit v1.2.3