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

Commit cecad743 authored Apr 03, 2019 by Tao Bao

libotautil exports libfstab header.

otautil/roots.h includes <fstab/fstab.h>, but users of otautil/roots.h
don't need to explicitly depend on libfstab unless they have a real
need.

Also remove the unneeded include of <fstab/fstab.h> from
fsck_unshare_blocks.cpp.

Test: mmma -j bootable/recovery
Change-Id: Id3dc995a4769e631ab242843ee439bd94b2bf0bc

parent bb8f0fff

Android.bp

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,6 @@ cc_defaults {

	// external dependencies		// external dependencies
	"libhealthhalutils",		"libhealthhalutils",
	"libfstab",
	],		],
	}		}

	@@ -153,7 +152,6 @@ cc_binary {

	static_libs: [		static_libs: [
	"libotautil",		"libotautil",
	"libfstab",
	],		],

	init_rc: [		init_rc: [
	@@ -181,7 +179,6 @@ cc_binary {

	static_libs: [		static_libs: [
	"libotautil",		"libotautil",
	"libfstab",
	],		],

	init_rc: [		init_rc: [

fsck_unshare_blocks.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,6 @@
	#include <android-base/logging.h>		#include <android-base/logging.h>
	#include <android-base/properties.h>		#include <android-base/properties.h>
	#include <android-base/unique_fd.h>		#include <android-base/unique_fd.h>
	#include <fstab/fstab.h>

	#include "otautil/roots.h"		#include "otautil/roots.h"

install/Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,6 @@ cc_defaults {
	// external dependencies		// external dependencies
	"libvintf_recovery",		"libvintf_recovery",
	"libvintf",		"libvintf",
	"libfstab",
	],		],
	}		}

otautil/Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -61,6 +61,10 @@ cc_library_static {
	"libfs_mgr",		"libfs_mgr",
	"libselinux",		"libselinux",
	],		],

			export_static_lib_headers: [
			"libfstab",
			],
	},		},
	},		},
	}		}