Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3f32b95 authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge changes I6c35d2e4,If16c3e19 

* changes:
  Move mounts.cpp from libotautil into libupdater.
  otautil: roots.cpp no longer needs 'mounts.h'.
parents e2ca8ba2 d628cfc1

otautil/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ cc_library_static { 
        android: {

            srcs: [

                "logging.cpp",

                "mounts.cpp",

                "parse_install_logs.cpp",

                "roots.cpp",

                "thermalutil.cpp",

otautil/roots.cpp

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <fs_mgr/roots.h>

#include <fs_mgr_dm_linear.h>



#include "otautil/mounts.h"

#include "otautil/sysutil.h"



using android::fs_mgr::Fstab;

updater/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ cc_library_static { 
        "blockimg.cpp",

        "commands.cpp",

        "install.cpp",

        "mounts.cpp",

        "updater.cpp",

    ],

updater/install.cpp

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
#include "edify/updater_runtime_interface.h"

#include "otautil/dirutil.h"

#include "otautil/error_code.h"

#include "otautil/mounts.h"

#include "otautil/print_sha1.h"

#include "otautil/sysutil.h"

otautil/mounts.cpp→updater/mounts.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "otautil/mounts.h"

#include "mounts.h"



#include <errno.h>

#include <fcntl.h>