Merge "remove use of include_dirs" (8bdb284b) · Commits · e / os / android_frameworks_av

cmds/screenrecord/Android.bp

+0 −6

Original line number	Diff line number	Diff line
		@@ -55,12 +55,6 @@ cc_binary {
		"libGLESv2",
		],

		include_dirs: [
		"frameworks/av/media/libstagefright",
		"frameworks/av/media/libstagefright/include",
		"frameworks/native/include/media/openmax",
		],

		cflags: [
		"-Werror",
		"-Wall",

+1 −4

Original line number	Diff line number	Diff line
		@@ -25,10 +25,6 @@ cc_library_static {
		"SoftwareRenderer.cpp",
		],

		include_dirs: [
		"frameworks/native/include/media/openmax",
		],

		shared_libs: [
		"libui",
		"libnativewindow",
		@@ -37,6 +33,7 @@ cc_library_static {
		header_libs: [
		"libstagefright_headers",
		"libstagefright_foundation_headers",
		"media_plugin_headers",
		],

		static_libs: ["libyuv_static"],

+0 −4

Original line number	Diff line number	Diff line
		@@ -22,10 +22,6 @@ cc_library_static {
		"ZeroFilter.cpp",
		],

		include_dirs: [
		"frameworks/native/include/media/openmax",
		],

		cflags: [
		"-Wno-multichar",
		"-Werror",

+1 −6

Original line number	Diff line number	Diff line
		@@ -33,18 +33,13 @@ cc_defaults {
		},
		host_supported: true,
		double_loadable: true,
		include_dirs: [
		"frameworks/av/include",
		"frameworks/native/include",
		"frameworks/native/libs/arect/include",
		"frameworks/native/libs/nativebase/include",
		],

		local_include_dirs: [
		"include/media/stagefright/foundation",
		],

		header_libs: [
		"av-headers",
		// this is only needed for the vendor variant that removes libbinder, but vendor
		// target below does not allow adding header_libs.
		"libbinder_headers",

+0 −4

Original line number	Diff line number	Diff line
		@@ -43,10 +43,6 @@ cc_test {
		"libstagefright_foundation",
		],

		include_dirs: [
		"frameworks/av/media/libstagefright/foundation",
		],

		cflags: [
		"-Werror",
		"-Wall",