Merge "Rearrange opengl llndk libraries to be next to implementations" (64618017) · Commits · e / os / android_frameworks_native

opengl/Android.bp

+5 −24

Original line number	Diff line number	Diff line
		@@ -52,36 +52,17 @@ ndk_headers {
		license: "include/KHR/NOTICE",
		}

		llndk_library {
		name: "libEGL.llndk",
		symbol_file: "libs/libEGL.map.txt",
		export_include_dirs: ["include"],
		}

		llndk_library {
		name: "libGLESv1_CM.llndk",
		symbol_file: "libs/libGLESv1_CM.map.txt",
		export_include_dirs: ["include"],
		}

		llndk_library {
		name: "libGLESv2.llndk",
		symbol_file: "libs/libGLESv2.map.txt",
		export_include_dirs: ["include"],
		}

		llndk_library {
		name: "libGLESv3.llndk",
		symbol_file: "libs/libGLESv3.map.txt",
		export_include_dirs: ["include"],
		}

		cc_library_headers {
		name: "gl_headers",
		vendor_available: true,
		export_include_dirs: ["include"],
		}

		llndk_headers {
		name: "gl_llndk_headers",
		export_include_dirs: ["include"],
		}

		subdirs = [
		"*",
		]

+24 −0

Original line number	Diff line number	Diff line
		@@ -230,3 +230,27 @@ cc_library_shared {
		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",
		symbol_file: "libGLESv3.map.txt",
		export_llndk_headers: ["gl_llndk_headers"],
		}