Merge "Replace llndk_library with llndk clause in cc_library" (b9627468) · Commits · e / os / android_frameworks_native-old

libs/binder/ndk/Android.bp

+3 −11

Original line number	Diff line number	Diff line
		@@ -55,7 +55,9 @@ cc_library {
		defaults: ["libbinder_ndk_host_user"],
		host_supported: true,

		llndk_stubs: "libbinder_ndk.llndk",
		llndk: {
		symbol_file: "libbinder_ndk.map.txt",
		},

		export_include_dirs: [
		"include_cpp",
		@@ -192,13 +194,3 @@ ndk_library {
		symbol_file: "libbinder_ndk.map.txt",
		first_version: "29",
		}

		llndk_library {
		name: "libbinder_ndk.llndk",
		symbol_file: "libbinder_ndk.map.txt",
		export_include_dirs: [
		"include_cpp",
		"include_ndk",
		"include_platform",
		],
		}

libs/nativewindow/Android.bp

+7 −8

Original line number	Diff line number	Diff line
		@@ -60,7 +60,13 @@ ndk_library {

		cc_library {
		name: "libnativewindow",
		llndk_stubs: "libnativewindow.llndk",
		llndk: {
		symbol_file: "libnativewindow.map.txt",
		unversioned: true,
		override_export_include_dirs: [
		"include"
		],
		},
		export_include_dirs: [
		"include",
		"include-private",
		@@ -115,11 +121,4 @@ cc_library {
		},
		}

		llndk_library {
		name: "libnativewindow.llndk",
		symbol_file: "libnativewindow.map.txt",
		unversioned: true,
		export_include_dirs: ["include"],
		}

		subdirs = ["tests"]

opengl/libs/Android.bp

+24 −28

Original line number	Diff line number	Diff line
		@@ -142,7 +142,12 @@ cc_library_static {
		cc_library_shared {
		name: "libEGL",
		defaults: ["egl_libs_defaults"],
		llndk_stubs: "libEGL.llndk",
		llndk: {
		symbol_file: "libEGL.map.txt",
		export_llndk_headers: ["gl_llndk_headers"],
		// Don't export EGL/include from the LLNDK variant.
		override_export_include_dirs: [],
		},
		srcs: [
		"EGL/egl_tls.cpp",
		"EGL/egl_cache.cpp",
		@@ -208,7 +213,12 @@ cc_defaults {
		cc_library_shared {
		name: "libGLESv1_CM",
		defaults: ["gles_libs_defaults"],
		llndk_stubs: "libGLESv1_CM.llndk",
		llndk: {
		symbol_file: "libGLESv1_CM.map.txt",
		export_llndk_headers: ["gl_llndk_headers"],
		// Don't export EGL/include from the LLNDK variant.
		override_export_include_dirs: [],
		},
		srcs: ["GLES_CM/gl.cpp"],
		cflags: ["-DLOG_TAG=\"libGLESv1\""],
		version_script: "libGLESv1_CM.map.txt",
		@@ -220,7 +230,12 @@ cc_library_shared {
		cc_library_shared {
		name: "libGLESv2",
		defaults: ["gles_libs_defaults"],
		llndk_stubs: "libGLESv2.llndk",
		llndk: {
		symbol_file: "libGLESv2.map.txt",
		export_llndk_headers: ["gl_llndk_headers"],
		// Don't export EGL/include from the LLNDK variant.
		override_export_include_dirs: [],
		},
		srcs: ["GLES2/gl2.cpp"],
		cflags: ["-DLOG_TAG=\"libGLESv2\""],

		@@ -235,31 +250,12 @@ cc_library_shared {
		cc_library_shared {
		name: "libGLESv3",
		defaults: ["gles_libs_defaults"],
		llndk_stubs: "libGLESv3.llndk",
		srcs: ["GLES2/gl2.cpp"],
		cflags: ["-DLOG_TAG=\"libGLESv3\""],
		}

		llndk_library {
		name: "libEGL.llndk",
		symbol_file: "libEGL.map.txt",
		export_llndk_headers: ["gl_llndk_headers"],
		}

		llndk_library {
		name: "libGLESv1_CM.llndk",
		symbol_file: "libGLESv1_CM.map.txt",
		export_llndk_headers: ["gl_llndk_headers"],
		}

		llndk_library {
		name: "libGLESv2.llndk",
		symbol_file: "libGLESv2.map.txt",
		export_llndk_headers: ["gl_llndk_headers"],
		}

		llndk_library {
		name: "libGLESv3.llndk",
		llndk: {
		symbol_file: "libGLESv3.map.txt",
		export_llndk_headers: ["gl_llndk_headers"],
		// Don't export EGL/include from the LLNDK variant.
		override_export_include_dirs: [],
		},
		srcs: ["GLES2/gl2.cpp"],
		cflags: ["-DLOG_TAG=\"libGLESv3\""],
		}

vulkan/libvulkan/Android.bp

+6 −9

Original line number	Diff line number	Diff line
		@@ -29,17 +29,14 @@ ndk_library {
		unversioned_until: "current",
		}

		llndk_library {
		name: "libvulkan.llndk",
		cc_library_shared {
		name: "libvulkan",
		llndk: {
		symbol_file: "libvulkan.map.txt",
		export_llndk_headers: [
		"vulkan_headers_llndk",
		],
		}

		cc_library_shared {
		name: "libvulkan",
		llndk_stubs: "libvulkan.llndk",
		},
		clang: true,
		sanitize: {
		misc_undefined: ["integer"],