Merge "The platform default is already newer than C++11." am: 287ce43dc4 (4d29392c) · Commits · e / os / android_frameworks_native-old

services/vr/virtual_touchpad/Android.bp

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,6 @@ cc_library {
	export_include_dirs: ["include"],		export_include_dirs: ["include"],
	shared_libs: shared_libs,		shared_libs: shared_libs,
	header_libs: header_libraries,		header_libs: header_libraries,
	cppflags: ["-std=c++11"],
	cflags: [		cflags: [
	"-DLOG_TAG=\"VrVirtualTouchpad\"",		"-DLOG_TAG=\"VrVirtualTouchpad\"",
	"-Wall",		"-Wall",
	@@ -51,9 +50,6 @@ cc_test {
	"-Wall",		"-Wall",
	"-Werror",		"-Werror",
	],		],
	cppflags: [
	"-std=c++11",
	],
	host_ldlibs: [		host_ldlibs: [
	"-llog",		"-llog",
	],		],
	@@ -86,7 +82,6 @@ cc_binary {
	static_libs: service_static_libs,		static_libs: service_static_libs,
	shared_libs: service_shared_libs,		shared_libs: service_shared_libs,
	header_libs: header_libraries,		header_libs: header_libraries,
	cppflags: ["-std=c++11"],
	cflags: [		cflags: [
	"-DLOG_TAG=\"VrVirtualTouchpad\"",		"-DLOG_TAG=\"VrVirtualTouchpad\"",
	"-Wall",		"-Wall",
	@@ -118,7 +113,6 @@ cc_library {
	srcs: client_src,		srcs: client_src,
	shared_libs: client_shared_libs,		shared_libs: client_shared_libs,
	header_libs: header_libraries,		header_libs: header_libraries,
	cppflags: ["-std=c++11"],
	cflags: [		cflags: [
	"-DLOG_TAG=\"VirtualTouchpadClient\"",		"-DLOG_TAG=\"VirtualTouchpadClient\"",
	"-Wall",		"-Wall",