Merge "libdm: Move includes to a libdm folder." (bdc56b04) · Commits · e / os / android_system_core

fs_mgr/libdm/dm.cpp

+2 −13

Original line number	Diff line number	Diff line
		@@ -14,23 +14,12 @@
		* limitations under the License.
		*/

		#include <errno.h>
		#include <fcntl.h>
		#include <linux/dm-ioctl.h>
		#include <stdint.h>
		#include "libdm/dm.h"

		#include <sys/ioctl.h>
		#include <sys/types.h>
		#include <unistd.h>

		#include <memory>
		#include <string>
		#include <vector>

		#include <android-base/logging.h>
		#include <android-base/macros.h>
		#include <android-base/unique_fd.h>

		#include "dm.h"

		namespace android {
		namespace dm {

+2 −5

Original line number	Diff line number	Diff line
		@@ -14,14 +14,11 @@
		* limitations under the License.
		*/

		#include "libdm/dm_table.h"

		#include <android-base/logging.h>
		#include <android-base/macros.h>

		#include <string>
		#include <vector>

		#include "dm_table.h"

		namespace android {
		namespace dm {

+2 −7

Original line number	Diff line number	Diff line
		@@ -14,16 +14,11 @@
		* limitations under the License.
		*/

		#include "libdm/dm_target.h"

		#include <android-base/logging.h>
		#include <android-base/macros.h>

		#include <stdint.h>

		#include <string>
		#include <vector>

		#include "dm_target.h"

		namespace android {
		namespace dm {} // namespace dm
		} // namespace android

+4 −2

Original line number	Diff line number	Diff line
		@@ -17,18 +17,20 @@
		#ifndef _LIBDM_DM_H_
		#define _LIBDM_DM_H_

		#include <errno.h>
		#include <fcntl.h>
		#include <linux/dm-ioctl.h>
		#include <linux/kdev_t.h>
		#include <stdint.h>
		#include <sys/sysmacros.h>
		#include <unistd.h>

		#include <memory>
		#include <string>
		#include <vector>

		#include <android-base/logging.h>

		#include <dm_table.h>
		#include "dm_table.h"

		// The minimum expected device mapper major.minor version
		#define DM_VERSION0 (4)

+0 −0

File moved.