Merge "libutils/libcutils: make host more like device" am: 43f29072a9 (775ed88d) · Commits · e / os / android_system_core

libcutils/Android.bp

+2 −3

Original line number	Diff line number	Diff line
		@@ -83,6 +83,8 @@ cc_library {
		],
		},
		windows: {
		host_ldlibs: ["-lws2_32"],

		srcs: [
		"socket_inaddr_any_server_windows.cpp",
		"socket_network_client_windows.cpp",
		@@ -91,9 +93,6 @@ cc_library {
		],

		enabled: true,
		shared: {
		enabled: false,
		},
		cflags: [
		"-D_GNU_SOURCE",
		],

+9 −15

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

		shared_libs: [
		"libcutils",
		"liblog",
		],

		@@ -83,7 +84,6 @@ cc_defaults {
		cflags: ["-fvisibility=protected"],

		shared_libs: [
		"libcutils",
		"libprocessgroup",
		"libdl",
		"libvndksupport",
		@@ -98,14 +98,6 @@ cc_defaults {
		exclude_shared_libs: ["libvndksupport"],
		},

		host: {
		cflags: ["-DLIBUTILS_NATIVE=1"],

		shared: {
		enabled: false,
		},
		},

		linux_bionic: {
		enabled: true,
		},
		@@ -180,18 +172,20 @@ cc_library {
		},
		},

		target: {
		android: {
		shared_libs: [
		"libutils",
		"libbacktrace",
		],
		},

		target: {
		linux: {
		srcs: [
		"ProcessCallStack.cpp",
		],
		},
		windows: {
		enabled: false,
		},
		},
		}