Merge "Merge libmounts into libotautil." am: 686353215f

am: cddf5dbf67

Change-Id: I57bcd1195084d2e60861aa5b410e2eb50c41c3c3

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",
 

Android.mk

@@ -174,7 +174,6 @@ LOCAL_STATIC_LIBRARIES += \
     libsparse \
     libziparchive \
     libotautil \
-    libmounts \
     libminadbd \
     libasyncio \
     libfusesideload \

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",
+            ],
+        },
+    },
 }

otautil/include/otautil/mounts.h

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef MOUNTS_H_
-#define MOUNTS_H_
+#pragma once
 
 struct MountedVolume;
 
@@ -24,5 +23,3 @@ bool scan_mounted_volumes();
 MountedVolume* find_mounted_volume_by_mount_point(const char* mount_point);
 
 int unmount_mounted_volume(MountedVolume* volume);
-
-#endif

otautil/mounts.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "mounts.h"
+#include "otautil/mounts.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -36,7 +36,7 @@ struct MountedVolume {
   std::string flags;
 };
 
-std::vector<MountedVolume*> g_mounts_state;
+static std::vector<MountedVolume*> g_mounts_state;
 
 bool scan_mounted_volumes() {
   for (size_t i = 0; i < g_mounts_state.size(); ++i) {

roots.cpp

@@ -39,7 +39,7 @@
 #include <ext4_utils/wipe.h>
 #include <fs_mgr.h>
 
-#include "mounts.h"
+#include "otautil/mounts.h"
 
 static struct fstab* fstab = nullptr;
 

tests/Android.mk

@@ -117,7 +117,6 @@ LOCAL_STATIC_LIBRARIES := \
     libbootloader_message \
     libverifier \
     libotautil \
-    libmounts \
     libupdate_verifier \
     libdivsufsort \
     libdivsufsort64 \

updater/Android.mk

@@ -24,14 +24,13 @@ tune2fs_static_libraries := \
 
 updater_common_static_libraries := \
     libapplypatch \
-    libbspatch \
-    libedify \
-    libziparchive \
-    libotautil \
     libbootloader_message \
-    libutils \
-    libmounts \
+    libedify \
     libotafault \
+    libotautil \
+    libbspatch \
+    libziparchive \
+    libutils \
     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 := \

updater/install.cpp

@@ -57,10 +57,10 @@
 #include <ziparchive/zip_archive.h>
 
 #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"