Merge "Remove libziparchive dependency on libutils" am: 34f8eaab0d (f9cd8e0e) · Commits · e / os / android_system_core

libutils/Android.bp

+71 −36

Original line number	Original line	Diff line number	Diff line
	@@ -43,8 +43,8 @@ cc_library_headers {
	},		},
	}		}

	cc_library {		cc_defaults {
	name: "libutils",		name: "libutils_defaults",
	vendor_available: true,		vendor_available: true,
	vndk: {		vndk: {
	enabled: true,		enabled: true,
	@@ -52,29 +52,6 @@ cc_library {
	},		},
	host_supported: true,		host_supported: true,

	srcs: [
	"CallStack.cpp",
	"FileMap.cpp",
	"JenkinsHash.cpp",
	"NativeHandle.cpp",
	"Printer.cpp",
	"PropertyMap.cpp",
	"RefBase.cpp",
	"SharedBuffer.cpp",
	"Static.cpp",
	"StopWatch.cpp",
	"String8.cpp",
	"String16.cpp",
	"StrongPointer.cpp",
	"SystemClock.cpp",
	"Threads.cpp",
	"Timers.cpp",
	"Tokenizer.cpp",
	"Unicode.cpp",
	"VectorImpl.cpp",
	"misc.cpp",
	],

	cflags: ["-Wall", "-Werror"],		cflags: ["-Wall", "-Werror"],
	include_dirs: ["external/safe-iop/include"],		include_dirs: ["external/safe-iop/include"],
	header_libs: [		header_libs: [
	@@ -96,14 +73,9 @@ cc_library {

	target: {		target: {
	android: {		android: {
	srcs: [
	"Trace.cpp",
	],

	cflags: ["-fvisibility=protected"],		cflags: ["-fvisibility=protected"],

	shared_libs: [		shared_libs: [
	"libbacktrace",
	"libcutils",		"libcutils",
	"libdl",		"libdl",
	"libvndksupport",		"libvndksupport",
	@@ -113,12 +85,6 @@ cc_library {
	misc_undefined: ["integer"],		misc_undefined: ["integer"],
	},		},
	},		},
	linux: {
	srcs: [
	"Looper.cpp",
	"ProcessCallStack.cpp",
	],
	},

	host: {		host: {
	cflags: ["-DLIBUTILS_NATIVE=1"],		cflags: ["-DLIBUTILS_NATIVE=1"],
	@@ -148,6 +114,75 @@ cc_library {
	},		},
	}		}

			cc_library {
			name: "libutils",
			defaults: ["libutils_defaults"],

			srcs: [
			"FileMap.cpp",
			"JenkinsHash.cpp",
			"NativeHandle.cpp",
			"Printer.cpp",
			"PropertyMap.cpp",
			"RefBase.cpp",
			"SharedBuffer.cpp",
			"Static.cpp",
			"StopWatch.cpp",
			"String8.cpp",
			"String16.cpp",
			"StrongPointer.cpp",
			"SystemClock.cpp",
			"Threads.cpp",
			"Timers.cpp",
			"Tokenizer.cpp",
			"Unicode.cpp",
			"VectorImpl.cpp",
			"misc.cpp",
			],

			target: {
			android: {
			srcs: [
			"Trace.cpp",
			],
			},
			linux: {
			srcs: [
			"Looper.cpp",
			],
			},
			},
			}

			cc_library {
			name: "libutilscallstack",
			defaults: ["libutils_defaults"],

			srcs: [
			"CallStack.cpp",
			],

			arch: {
			mips: {
			cflags: ["-DALIGN_DOUBLE"],
			},
			},

			target: {
			android: {
			shared_libs: [
			"libutils",
			"libbacktrace",
			],
			},
			linux: {
			srcs: [
			"ProcessCallStack.cpp",
			],
			},
			},
			}

	// Include subdirectory makefiles		// Include subdirectory makefiles
	// ============================================================		// ============================================================