Merge "Move selinux dependencies out of header files." (81247500) · Commits · e / tools / etwrp

minzip/DirUtil.cpp

+4 −1

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

		#include "DirUtil.h"

		#include <stdlib.h>
		#include <string.h>
		#include <stdio.h>
		@@ -26,7 +28,8 @@

		#include <string>

		#include "DirUtil.h"
		#include <selinux/label.h>
		#include <selinux/selinux.h>

		typedef enum { DMISSING, DDIR, DILLEGAL } DirStatus;

+1 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,7 @@
		extern "C" {
		#endif

		#include <selinux/selinux.h>
		#include <selinux/label.h>
		struct selabel_handle;

		/* Like "mkdir -p", try to guarantee that all directories
		* specified in path are present, creating as many directories

+3 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,9 @@
		#undef NDEBUG // do this after including Log.h
		#include <assert.h>

		#include <selinux/label.h>
		#include <selinux/selinux.h>

		#define SORT_ENTRIES 1

		/*

+1 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,7 @@
		extern "C" {
		#endif

		#include <selinux/selinux.h>
		#include <selinux/label.h>
		struct selabel_handle;

		/*
		* One entry in the Zip archive. Treat this as opaque -- use accessors below.

+3 −2

Original line number	Diff line number	Diff line
		@@ -41,10 +41,11 @@
		#include <android-base/stringprintf.h>
		#include <cutils/android_reboot.h>
		#include <cutils/properties.h>
		#include <healthd/BatteryMonitor.h>
		#include <log/logger.h> /* Android Log packet format */
		#include <private/android_logger.h> /* private pmsg functions */

		#include <healthd/BatteryMonitor.h>
		#include <selinux/label.h>
		#include <selinux/selinux.h>

		#include "adb_install.h"
		#include "bootloader.h"