Merge "Remove EXCLUDE_FS_CONFIG_STRUCTURES" am: 79f3d26b25 (c336c565) · Commits · e / os / android_system_core

cpio/mkbootfs.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@
	#include <fcntl.h>		#include <fcntl.h>

	#include <private/android_filesystem_config.h>		#include <private/android_filesystem_config.h>
			#include <private/fs_config.h>

	/* NOTES		/* NOTES
	**		**

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@
	#include <android-base/logging.h>		#include <android-base/logging.h>
	#include <android-base/parseint.h>		#include <android-base/parseint.h>
	#include <android-base/strings.h>		#include <android-base/strings.h>
			#include <generated_android_ids.h>
	#include <hidl/metadata.h>		#include <hidl/metadata.h>
	#include <property_info_serializer/property_info_serializer.h>		#include <property_info_serializer/property_info_serializer.h>

	@@ -48,9 +49,6 @@
	#include "service_list.h"		#include "service_list.h"
	#include "service_parser.h"		#include "service_parser.h"

	#define EXCLUDE_FS_CONFIG_STRUCTURES
	#include "generated_android_ids.h"

	using namespace std::literals;		using namespace std::literals;

	using android::base::ParseInt;		using android::base::ParseInt;

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -34,14 +34,7 @@
	* partition, from which the system reads passwd and group files.		* partition, from which the system reads passwd and group files.
	*/		*/

	#ifndef _ANDROID_FILESYSTEM_CONFIG_H_		#pragma once
	#define _ANDROID_FILESYSTEM_CONFIG_H_

	#include <sys/types.h>

	#if !defined(__ANDROID_VNDK__) && !defined(EXCLUDE_FS_CONFIG_STRUCTURES)
	#include <private/fs_config.h>
	#endif

	/* This is the master Users and Groups config for the platform.		/* This is the master Users and Groups config for the platform.
	* DO NOT EVER RENUMBER		* DO NOT EVER RENUMBER
	@@ -224,5 +217,3 @@
	* documented at the top of this header file.		* documented at the top of this header file.
	* Also see build/tools/fs_config for more details.		* Also see build/tools/fs_config for more details.
	*/		*/

	#endif

+2 −4

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

	#ifndef _CANNED_FS_CONFIG_H		#pragma once
	#define _CANNED_FS_CONFIG_H

	#include <inttypes.h>		#include <inttypes.h>
			#include <sys/cdefs.h>

	__BEGIN_DECLS		__BEGIN_DECLS

	@@ -26,5 +26,3 @@ void canned_fs_config(const char* path, int dir, const char* target_out_path, un
	unsigned* gid, unsigned* mode, uint64_t* capabilities);		unsigned* gid, unsigned* mode, uint64_t* capabilities);

	__END_DECLS		__END_DECLS

	#endif