Merge changes from topic "gfxstream-build-libnames" into main
* changes:
Format Android.bp files
Normalize some Gfxstream library names
diff --git a/Android.bp b/Android.bp
index cf44e07..09c58d4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,12 +52,12 @@
header_libs: [
"aemu_common_headers",
"gfxstream_magma_headers",
- "gfxstream_vulkan_headers",
+ "libgfxstream_vulkan_headers",
],
export_header_lib_headers: [
"aemu_common_headers",
"gfxstream_magma_headers",
- "gfxstream_vulkan_headers",
+ "libgfxstream_vulkan_headers",
],
apex_available: [
"//apex_available:platform",
@@ -147,16 +147,16 @@
cflags: [
"-U__ANDROID__",
"-UANDROID",
- ]
+ ],
},
android: {
compile_multilib: "64",
- shared_libs: [ "libnativewindow", ],
+ shared_libs: ["libnativewindow"],
},
linux_bionic_arm64: {
enabled: true,
- cflags: [ "-Dandroidbionic", ],
- }
+ cflags: ["-Dandroidbionic"],
+ },
},
host_supported: true,
vendor_available: true,
diff --git a/common/detector/Android.bp b/common/detector/Android.bp
index ef2eb1a..7b137b4 100644
--- a/common/detector/Android.bp
+++ b/common/detector/Android.bp
@@ -30,7 +30,7 @@
"Vulkan.cpp",
],
header_libs: [
- "gfxstream_vulkan_headers",
+ "libgfxstream_vulkan_headers",
],
static_libs: [
"libgfxstream_graphics_detector_proto",
diff --git a/common/end2end/Android.bp b/common/end2end/Android.bp
index 6e293c5..aa83a91 100644
--- a/common/end2end/Android.bp
+++ b/common/end2end/Android.bp
@@ -1,4 +1,3 @@
-
package {
// See: http://go/android-license-faq
default_applicable_licenses: ["hardware_google_gfxstream_license"],
@@ -7,7 +6,7 @@
// Run with `atest --host GfxstreamEnd2EndTests`
cc_test_host {
name: "GfxstreamEnd2EndTests",
- defaults: [ "gfxstream_cc_defaults" ],
+ defaults: ["gfxstream_cc_defaults"],
srcs: [
"GfxstreamEnd2EndTests.cpp",
"GfxstreamEnd2EndGlTests.cpp",
@@ -23,20 +22,20 @@
"libGLESv2_emulation_with_host",
"libEGL_emulation_with_host",
"libgfxstream_guest_vulkan_with_host",
- "libplatform_rutabaga_server",
+ "libgfxstream_platform_rutabaga_server",
],
shared_libs: [
"libandroidemu",
"libOpenglSystemCommonWithHost",
"libbase",
"liblog",
- "libplatform_rutabaga_server",
+ "libgfxstream_platform_rutabaga_server",
],
static_libs: [
"libc++fs",
"libgfxstream_guest_android_with_host",
"libgmock",
- "libplatform_rutabaga",
+ "libgfxstream_platform_rutabaga",
],
cflags: [
// TODO: remove
diff --git a/common/opengl/Android.bp b/common/opengl/Android.bp
index df3556f..de250a3 100644
--- a/common/opengl/Android.bp
+++ b/common/opengl/Android.bp
@@ -14,4 +14,4 @@
"//apex_available:platform",
"com.android.virt",
],
-}
\ No newline at end of file
+}
diff --git a/common/vulkan/Android.bp b/common/vulkan/Android.bp
index a35a506..900d858 100644
--- a/common/vulkan/Android.bp
+++ b/common/vulkan/Android.bp
@@ -1,5 +1,5 @@
cc_library_headers {
- name: "gfxstream_vulkan_headers",
+ name: "libgfxstream_vulkan_headers",
export_include_dirs: ["include"],
host_supported: true,
vendor_available: true,
diff --git a/guest/GoldfishAddressSpace/Android.bp b/guest/GoldfishAddressSpace/Android.bp
index 018ff9a..5600e5e 100644
--- a/guest/GoldfishAddressSpace/Android.bp
+++ b/guest/GoldfishAddressSpace/Android.bp
@@ -19,7 +19,7 @@
"liblog",
],
static_libs: [
- "libandroidemu_static",
+ "libgfxstream_androidemu_static",
"libplatform",
],
export_include_dirs: [
diff --git a/guest/OpenglCodecCommon/Android.bp b/guest/OpenglCodecCommon/Android.bp
index 2b7b838..f745c9d 100644
--- a/guest/OpenglCodecCommon/Android.bp
+++ b/guest/OpenglCodecCommon/Android.bp
@@ -53,11 +53,11 @@
"liblog",
],
export_static_lib_headers: [
- "libandroidemu_static",
+ "libgfxstream_androidemu_static",
],
static_libs: [
"libgfxstream_etc",
- "libandroidemu_static",
+ "libgfxstream_androidemu_static",
"libqemupipe.ranchu",
],
cflags: [
diff --git a/guest/OpenglSystemCommon/Android.bp b/guest/OpenglSystemCommon/Android.bp
index 3cb00d6..e08fcce 100644
--- a/guest/OpenglSystemCommon/Android.bp
+++ b/guest/OpenglSystemCommon/Android.bp
@@ -52,7 +52,7 @@
"libgfxstream_guest_cc_defaults",
],
header_libs: [
- "gfxstream_vulkan_headers",
+ "libgfxstream_vulkan_headers",
"libgfxstream_guest_graphics_headers",
"libgfxstream_guest_iostream",
"libhardware_headers",
@@ -134,7 +134,7 @@
"libnativewindow",
"libsync",
],
- }
+ },
},
}
@@ -145,16 +145,16 @@
],
shared_libs: [
"libandroidemu",
- "libplatform_rutabaga_server",
+ "libgfxstream_platform_rutabaga_server",
],
static_libs: [
"libgfxstream_guest_android_with_host",
"libgfxstream_guest_vulkan_encoder_with_host",
- "libplatform_rutabaga",
+ "libgfxstream_platform_rutabaga",
],
export_static_lib_headers: [
"libgfxstream_guest_android_with_host",
- "libplatform_rutabaga",
+ "libgfxstream_platform_rutabaga",
],
target: {
host: {
@@ -175,7 +175,7 @@
"vulkan_enc_headers",
],
static_libs: [
- "libandroidemu_static",
+ "libgfxstream_androidemu_static",
"libgfxstream_guest_android",
"libplatform",
],
@@ -194,16 +194,16 @@
"vulkan_enc_headers",
],
shared_libs: [
- "libplatform_rutabaga_server",
+ "libgfxstream_platform_rutabaga_server",
],
static_libs: [
- "libandroidemu_static",
+ "libgfxstream_androidemu_static",
"libgfxstream_guest_android_with_host",
- "libplatform_rutabaga",
+ "libgfxstream_platform_rutabaga",
],
export_static_lib_headers: [
"libgfxstream_guest_android_with_host",
- "libplatform_rutabaga",
+ "libgfxstream_platform_rutabaga",
],
target: {
host: {
diff --git a/guest/android-emu/Android.bp b/guest/android-emu/Android.bp
index 96d7ef6..f510d2a 100644
--- a/guest/android-emu/Android.bp
+++ b/guest/android-emu/Android.bp
@@ -47,7 +47,7 @@
}
cc_library_static {
- name: "libandroidemu_static",
+ name: "libgfxstream_androidemu_static",
defaults: [
"libgfxstream_guest_cc_defaults",
],
diff --git a/guest/android/Android.bp b/guest/android/Android.bp
index 4846597..c2d06cc 100644
--- a/guest/android/Android.bp
+++ b/guest/android/Android.bp
@@ -39,7 +39,7 @@
"libdrm",
],
export_include_dirs: [
- "include"
+ "include",
],
local_include_dirs: [
".",
@@ -88,7 +88,7 @@
"libgfxstream_guest_android_defaults",
],
static_libs: [
- "libplatform_rutabaga",
+ "libgfxstream_platform_rutabaga",
],
target: {
host: {
@@ -102,4 +102,4 @@
"ANativeWindowEmulated.cpp",
"GrallocEmulated.cpp",
],
-}
\ No newline at end of file
+}
diff --git a/guest/gralloc_cb/Android.bp b/guest/gralloc_cb/Android.bp
index 9565d00..7fa1b97 100644
--- a/guest/gralloc_cb/Android.bp
+++ b/guest/gralloc_cb/Android.bp
@@ -30,6 +30,6 @@
],
export_header_lib_headers: [
"libcutils_headers",
- "libqemupipe-types.ranchu"
+ "libqemupipe-types.ranchu",
],
}
diff --git a/guest/magma/Android.bp b/guest/magma/Android.bp
index 12d8e6a..17cdd85 100644
--- a/guest/magma/Android.bp
+++ b/guest/magma/Android.bp
@@ -36,7 +36,7 @@
"libplatform",
"libgfxstream_guest_android",
"libGoldfishAddressSpace",
- "libandroidemu_static",
+ "libgfxstream_androidemu_static",
],
srcs: [
"magma.cpp",
diff --git a/guest/platform/Android.bp b/guest/platform/Android.bp
index 9fdd009..1905bc2 100644
--- a/guest/platform/Android.bp
+++ b/guest/platform/Android.bp
@@ -61,7 +61,7 @@
}
cc_library_shared {
- name: "libplatform_rutabaga_server",
+ name: "libgfxstream_platform_rutabaga_server",
host_supported: true,
vendor_available: true,
srcs: [
@@ -93,7 +93,7 @@
}
cc_library_static {
- name: "libplatform_rutabaga",
+ name: "libgfxstream_platform_rutabaga",
host_supported: true,
vendor_available: true,
srcs: [
@@ -106,7 +106,7 @@
shared_libs: [
"libcutils",
"libdrm",
- "libplatform_rutabaga_server",
+ "libgfxstream_platform_rutabaga_server",
"liblog",
"libutils",
],
@@ -138,7 +138,7 @@
}
cc_library_static {
- name: "libplatform_stub",
+ name: "libgfxstream_platform_stub",
host_supported: true,
vendor: true,
srcs: [
diff --git a/guest/vulkan/Android.bp b/guest/vulkan/Android.bp
index 16047ae..806a77c 100644
--- a/guest/vulkan/Android.bp
+++ b/guest/vulkan/Android.bp
@@ -33,7 +33,7 @@
"vk_physical_device_properties_header_gfxstream",
],
header_libs: [
- "gfxstream_vulkan_headers",
+ "libgfxstream_vulkan_headers",
"mesa_common_headers_gfxstream",
"libnativewindow_headers",
"vulkan_enc_headers",
@@ -50,7 +50,7 @@
"libringbuffer",
"libqemupipe.ranchu",
"libarect",
- "libandroidemu_static",
+ "libgfxstream_androidemu_static",
],
shared_libs: [
"liblog",
@@ -124,12 +124,12 @@
"libgfxstream_guest_vulkan_defaults",
],
shared_libs: [
- "libplatform_rutabaga_server",
+ "libgfxstream_platform_rutabaga_server",
],
static_libs: [
"libgfxstream_guest_android_with_host",
"libgfxstream_guest_system_common_with_host",
- "libplatform_rutabaga",
+ "libgfxstream_platform_rutabaga",
],
cflags: [
"-DEND2END_TESTS",
diff --git a/guest/vulkan_enc/Android.bp b/guest/vulkan_enc/Android.bp
index 96c922f..f06d7b8 100644
--- a/guest/vulkan_enc/Android.bp
+++ b/guest/vulkan_enc/Android.bp
@@ -112,7 +112,7 @@
"libgfxstream_guest_cc_defaults",
],
header_libs: [
- "gfxstream_vulkan_headers",
+ "libgfxstream_vulkan_headers",
"libOpenglSystemCommonHeaders",
"libgfxstream_guest_iostream",
"libnativewindow_headers",
@@ -132,7 +132,7 @@
static_libs: [
"libarect",
"libdrm",
- "libandroidemu_static",
+ "libgfxstream_androidemu_static",
"libGoldfishAddressSpace",
"libmesa_vulkan_util_gfxstream",
"libmesa_vulkan_runtime_gfxstream",
@@ -198,10 +198,10 @@
"libgfxstream_guest_vulkan_encoder_defaults",
],
static_libs: [
- "libplatform_rutabaga",
+ "libgfxstream_platform_rutabaga",
],
export_static_lib_headers: [
- "libplatform_rutabaga",
+ "libgfxstream_platform_rutabaga",
],
target: {
host: {
diff --git a/guest/vulkan_enc_unit_tests/Android.bp b/guest/vulkan_enc_unit_tests/Android.bp
index c586bbb..8e3751d 100644
--- a/guest/vulkan_enc_unit_tests/Android.bp
+++ b/guest/vulkan_enc_unit_tests/Android.bp
@@ -30,7 +30,7 @@
"CommandBufferStagingStream_test.cpp",
],
header_libs: [
- "gfxstream_vulkan_headers",
+ "libgfxstream_vulkan_headers",
"libgfxstream_guest_iostream",
],
shared_libs: [
diff --git a/host/Android.bp b/host/Android.bp
index 6e770f3..426193f 100644
--- a/host/Android.bp
+++ b/host/Android.bp
@@ -29,40 +29,40 @@
],
header_libs: [
"gfxstream_opengl_headers",
- "gfxstream_vulkan_cereal_common",
+ "libgfxstream_host_vulkan_cereal_common",
],
static_libs: [
"gfxstream_base",
"gfxstream_host_common",
- "gfxstream_gl_host_common",
- "gfxstream_apigen_codec_common",
- "gfxstream_gl_server",
- "gfxstream_gles1_dec",
- "gfxstream_gles2_dec",
- "gfxstream_glsnapshot",
- "gfxstream_magma_dec",
- "gfxstream_magma_server",
- "gfxstream_translator_glcommon",
- "gfxstream_translator_egl",
- "gfxstream_translator_glescm",
- "gfxstream_translator_glesv2",
- "gfxstream_vulkan_cereal_host",
- "gfxstream_vulkan_server",
- "gfxstream_renderControl_dec",
- "gfxstream_dispatch",
- "gfxstream_glm",
- "gfxstream_compressedTextures",
- "gfxstream_emulated_textures",
"libgfxstream_common_utils",
"libgfxstream_etc",
+ "libgfxstream_glestranslator_egl",
+ "libgfxstream_glestranslator_glescm",
+ "libgfxstream_glestranslator_glesv2",
+ "libgfxstream_host_apigen_codec_common",
+ "libgfxstream_host_compressedtextures",
+ "libgfxstream_host_dispatch",
+ "libgfxstream_host_gl_host_common",
+ "libgfxstream_host_gl_server",
+ "libgfxstream_host_gles1_dec",
+ "libgfxstream_host_gles2_dec",
+ "libgfxstream_host_glestranslator_glcommon",
+ "libgfxstream_host_glsnapshot",
+ "libgfxstream_host_magma_dec",
+ "libgfxstream_host_magma_server",
+ "libgfxstream_host_rendercontrol_dec",
+ "libgfxstream_host_vulkan_cereal",
+ "libgfxstream_host_vulkan_emulatedtextures",
+ "libgfxstream_host_vulkan_server",
+ "libgfxstream_thirdparty_glm",
],
export_static_lib_headers: [
"gfxstream_base",
- "gfxstream_gl_host_common",
- "gfxstream_gles2_dec",
- "gfxstream_glsnapshot",
- "gfxstream_magma_server",
- "gfxstream_vulkan_cereal_host",
+ "libgfxstream_host_gl_host_common",
+ "libgfxstream_host_gles2_dec",
+ "libgfxstream_host_glsnapshot",
+ "libgfxstream_host_magma_server",
+ "libgfxstream_host_vulkan_cereal",
],
shared_libs: [
"liblog", // gfxstream_base uses this via perfetto-libperfettobase
@@ -127,22 +127,22 @@
],
header_libs: [
"gfxstream_opengl_headers",
- "gfxstream_vulkan_cereal_common",
+ "libgfxstream_host_vulkan_cereal_common",
],
shared_libs: [
"libbase",
"libgfxstream_backend",
],
export_static_lib_headers: [
- "gfxstream_oswindow_test_support",
+ "libgfxstream_oswindow_test_support",
],
static_libs: [
- "gfxstream_apigen_codec_common",
+ "libgfxstream_host_apigen_codec_common",
"gfxstream_base",
"gfxstream_base_test_support",
"gfxstream_host_common_test_support",
"gfxstream_snapshot",
- "gfxstream_oswindow_test_support",
+ "libgfxstream_oswindow_test_support",
"libgmock",
"liblz4",
],
@@ -156,7 +156,7 @@
"libbase",
],
static_libs: [
- "libgfxstream_stb",
+ "libgfxstream_thirdparty_stb",
],
srcs: [
"tests/ImageUtils.cpp",
@@ -168,7 +168,7 @@
name: "gfxstream_compositorvk_test",
defaults: ["gfxstream_defaults"],
header_libs: [
- "gfxstream_vulkan_cereal_common",
+ "libgfxstream_host_vulkan_cereal_common",
],
srcs: [
"tests/CompositorVk_unittest.cpp",
@@ -208,8 +208,8 @@
"libgfxstream_test_image_utils",
],
static_libs: [
- "gfxstream_vulkan_server",
- "gfxstream_glm",
+ "libgfxstream_host_vulkan_server",
+ "libgfxstream_thirdparty_glm",
"libc++fs",
],
test_options: {
@@ -226,7 +226,7 @@
name: "gfxstream_framebuffer_tests",
defaults: ["gfxstream_defaults"],
header_libs: [
- "gfxstream_vulkan_cereal_common",
+ "libgfxstream_host_vulkan_cereal_common",
],
srcs: [
"tests/FrameBuffer_unittest.cpp",
@@ -240,11 +240,11 @@
"gfxstream_backend_test_support",
"gfxstream_base",
"gfxstream_base_test_support",
- "gfxstream_glm",
+ "libgfxstream_thirdparty_glm",
"gfxstream_host_common_test_support",
- "gfxstream_oswindow_test_support",
+ "libgfxstream_oswindow_test_support",
"gfxstream_snapshot",
- "gfxstream_vulkan_server",
+ "libgfxstream_host_vulkan_server",
"libgmock",
"liblz4",
],
diff --git a/host/apigen-codec-common/Android.bp b/host/apigen-codec-common/Android.bp
index 808ab78..ec741f5 100644
--- a/host/apigen-codec-common/Android.bp
+++ b/host/apigen-codec-common/Android.bp
@@ -16,11 +16,14 @@
}
cc_library_static {
- name: "gfxstream_apigen_codec_common",
- defaults: [ "gfxstream_defaults" ],
- static_libs: [ "gfxstream_base", "gfxstream_host_common", ],
- cflags: [ "-fvisibility=hidden" ],
- export_include_dirs: [ "." ],
+ name: "libgfxstream_host_apigen_codec_common",
+ defaults: ["gfxstream_defaults"],
+ static_libs: [
+ "gfxstream_base",
+ "gfxstream_host_common",
+ ],
+ cflags: ["-fvisibility=hidden"],
+ export_include_dirs: ["."],
srcs: [
"ChecksumCalculator.cpp",
"ChecksumCalculatorThreadInfo.cpp",
@@ -28,7 +31,7 @@
],
target: {
host: {
- srcs: [ "X11Support.cpp", ],
- }
- }
+ srcs: ["X11Support.cpp"],
+ },
+ },
}
diff --git a/host/compressedTextureFormats/Android.bp b/host/compressedTextureFormats/Android.bp
index 1e50124..e811381 100644
--- a/host/compressedTextureFormats/Android.bp
+++ b/host/compressedTextureFormats/Android.bp
@@ -8,8 +8,8 @@
}
cc_library_static {
- name: "gfxstream_compressedTextures",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_compressedtextures",
+ defaults: ["gfxstream_defaults"],
srcs: [
"AstcCpuDecompressorNoOp.cpp",
],
diff --git a/host/gl/Android.bp b/host/gl/Android.bp
index 36e2566..65dd9f9 100644
--- a/host/gl/Android.bp
+++ b/host/gl/Android.bp
@@ -9,8 +9,8 @@
}
cc_library_static {
- name: "gfxstream_gl_server",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_gl_server",
+ defaults: ["gfxstream_defaults"],
srcs: [
"BufferGl.cpp",
"ColorBufferGl.cpp",
@@ -35,8 +35,8 @@
"gfxstream_opengl_headers",
],
static_libs: [
- "gfxstream_gles1_dec",
- "gfxstream_gles2_dec",
- "gfxstream_glsnapshot",
+ "libgfxstream_host_gles1_dec",
+ "libgfxstream_host_gles2_dec",
+ "libgfxstream_host_glsnapshot",
],
-}
\ No newline at end of file
+}
diff --git a/host/gl/OpenGLESDispatch/Android.bp b/host/gl/OpenGLESDispatch/Android.bp
index 99369a4..4c045aa 100644
--- a/host/gl/OpenGLESDispatch/Android.bp
+++ b/host/gl/OpenGLESDispatch/Android.bp
@@ -8,18 +8,18 @@
}
cc_library_static {
- name: "gfxstream_dispatch",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_dispatch",
+ defaults: ["gfxstream_defaults"],
header_libs: [
"gfxstream_opengl_headers",
],
static_libs: [
"gfxstream_base",
- "gfxstream_glm",
- "gfxstream_gles1_dec",
- "gfxstream_gles2_dec",
- "gfxstream_apigen_codec_common",
- "gfxstream_translator_egl",
+ "libgfxstream_thirdparty_glm",
+ "libgfxstream_host_gles1_dec",
+ "libgfxstream_host_gles2_dec",
+ "libgfxstream_host_apigen_codec_common",
+ "libgfxstream_glestranslator_egl",
],
cflags: [
"-fvisibility=default",
diff --git a/host/gl/gl-host-common/Android.bp b/host/gl/gl-host-common/Android.bp
index de12c1a..1675504 100644
--- a/host/gl/gl-host-common/Android.bp
+++ b/host/gl/gl-host-common/Android.bp
@@ -9,15 +9,15 @@
cc_library_headers {
name: "gfxstream_gl_host_common_headers",
- defaults: [ "gfxstream_defaults" ],
+ defaults: ["gfxstream_defaults"],
export_include_dirs: [
"include",
],
}
cc_library_static {
- name: "gfxstream_gl_host_common",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_gl_host_common",
+ defaults: ["gfxstream_defaults"],
static_libs: [
"gfxstream_base",
"gfxstream_host_common",
@@ -42,4 +42,3 @@
"opengl/NativeGpuInfo_linux.cpp",
],
}
-
diff --git a/host/gl/gles1_dec/Android.bp b/host/gl/gles1_dec/Android.bp
index 6bd3c0c..2f9da63 100644
--- a/host/gl/gles1_dec/Android.bp
+++ b/host/gl/gles1_dec/Android.bp
@@ -8,14 +8,14 @@
}
cc_library_static {
- name: "gfxstream_gles1_dec",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_gles1_dec",
+ defaults: ["gfxstream_defaults"],
header_libs: [
"gfxstream_opengl_headers",
],
static_libs: [
- "gfxstream_apigen_codec_common",
- "gfxstream_glsnapshot",
+ "libgfxstream_host_apigen_codec_common",
+ "libgfxstream_host_glsnapshot",
],
srcs: [
"gles1_dec.cpp",
diff --git a/host/gl/gles2_dec/Android.bp b/host/gl/gles2_dec/Android.bp
index 93e99d6..71a2982 100644
--- a/host/gl/gles2_dec/Android.bp
+++ b/host/gl/gles2_dec/Android.bp
@@ -8,14 +8,14 @@
}
cc_library_static {
- name: "gfxstream_gles2_dec",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_gles2_dec",
+ defaults: ["gfxstream_defaults"],
header_libs: [
"gfxstream_opengl_headers",
],
static_libs: [
- "gfxstream_apigen_codec_common",
- "gfxstream_glsnapshot",
+ "libgfxstream_host_apigen_codec_common",
+ "libgfxstream_host_glsnapshot",
],
srcs: [
"gles2_dec.cpp",
diff --git a/host/gl/glestranslator/EGL/Android.bp b/host/gl/glestranslator/EGL/Android.bp
index edc282e..f612102 100644
--- a/host/gl/glestranslator/EGL/Android.bp
+++ b/host/gl/glestranslator/EGL/Android.bp
@@ -8,18 +8,18 @@
}
cc_library_static {
- name: "gfxstream_translator_egl",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_glestranslator_egl",
+ defaults: ["gfxstream_defaults"],
header_libs: [
"gfxstream_gl_host_common_headers",
"gfxstream_opengl_headers",
],
static_libs: [
"gfxstream_base",
- "gfxstream_apigen_codec_common",
- "gfxstream_translator_glcommon",
- "gfxstream_translator_glescm",
- "gfxstream_translator_glesv2",
+ "libgfxstream_host_apigen_codec_common",
+ "libgfxstream_host_glestranslator_glcommon",
+ "libgfxstream_glestranslator_glescm",
+ "libgfxstream_glestranslator_glesv2",
],
cflags: [
"-fvisibility=hidden",
@@ -48,6 +48,6 @@
"EglOsApi_glx.cpp",
"X11ErrorHandler.cpp",
],
- }
- }
+ },
+ },
}
diff --git a/host/gl/glestranslator/GLES_CM/Android.bp b/host/gl/glestranslator/GLES_CM/Android.bp
index 018faaa..9ba8e65 100644
--- a/host/gl/glestranslator/GLES_CM/Android.bp
+++ b/host/gl/glestranslator/GLES_CM/Android.bp
@@ -8,16 +8,16 @@
}
cc_library_static {
- name: "gfxstream_translator_glescm",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_glestranslator_glescm",
+ defaults: ["gfxstream_defaults"],
header_libs: [
"gfxstream_opengl_headers",
],
static_libs: [
"gfxstream_base",
- "gfxstream_glm",
- "gfxstream_apigen_codec_common",
- "gfxstream_translator_glcommon",
+ "libgfxstream_thirdparty_glm",
+ "libgfxstream_host_apigen_codec_common",
+ "libgfxstream_host_glestranslator_glcommon",
],
cflags: [
"-fvisibility=hidden",
diff --git a/host/gl/glestranslator/GLES_V2/Android.bp b/host/gl/glestranslator/GLES_V2/Android.bp
index c969c1e..0b1ad3b 100644
--- a/host/gl/glestranslator/GLES_V2/Android.bp
+++ b/host/gl/glestranslator/GLES_V2/Android.bp
@@ -8,15 +8,15 @@
}
cc_library_static {
- name: "gfxstream_translator_glesv2",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_glestranslator_glesv2",
+ defaults: ["gfxstream_defaults"],
header_libs: [
"gfxstream_opengl_headers",
],
static_libs: [
"gfxstream_base",
- "gfxstream_apigen_codec_common",
- "gfxstream_translator_glcommon",
+ "libgfxstream_host_apigen_codec_common",
+ "libgfxstream_host_glestranslator_glcommon",
],
cflags: [
"-fvisibility=hidden",
diff --git a/host/gl/glestranslator/GLcommon/Android.bp b/host/gl/glestranslator/GLcommon/Android.bp
index 765103b..5929319 100644
--- a/host/gl/glestranslator/GLcommon/Android.bp
+++ b/host/gl/glestranslator/GLcommon/Android.bp
@@ -8,8 +8,8 @@
}
cc_library_static {
- name: "gfxstream_translator_glcommon",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_glestranslator_glcommon",
+ defaults: ["gfxstream_defaults"],
cflags: [
"-fvisibility=hidden",
"-Wno-inconsistent-missing-override",
diff --git a/host/gl/glsnapshot/Android.bp b/host/gl/glsnapshot/Android.bp
index 0218431..a93c9b9 100644
--- a/host/gl/glsnapshot/Android.bp
+++ b/host/gl/glsnapshot/Android.bp
@@ -11,8 +11,8 @@
}
cc_library_static {
- name: "gfxstream_glsnapshot",
- defaults: [ "gfxstream_defaults" ],
- srcs: [ "GLSnapshot.cpp", ],
- export_include_dirs: [ "." ],
+ name: "libgfxstream_host_glsnapshot",
+ defaults: ["gfxstream_defaults"],
+ srcs: ["GLSnapshot.cpp"],
+ export_include_dirs: ["."],
}
diff --git a/host/magma/Android.bp b/host/magma/Android.bp
index 1ce98fb..bc64fd6 100644
--- a/host/magma/Android.bp
+++ b/host/magma/Android.bp
@@ -3,14 +3,14 @@
}
cc_library_static {
- name: "gfxstream_magma_server",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_magma_server",
+ defaults: ["gfxstream_defaults"],
static_libs: [
"gfxstream_base",
"gfxstream_host_common",
- "gfxstream_magma_dec",
- "gfxstream_apigen_codec_common",
- "gfxstream_vulkan_cereal_host",
+ "libgfxstream_host_magma_dec",
+ "libgfxstream_host_apigen_codec_common",
+ "libgfxstream_host_vulkan_cereal",
],
srcs: [
"Decoder.cpp",
@@ -49,6 +49,6 @@
cflags: [
"-DGFXSTREAM_MAGMA_USE_INTEL_DRM=1",
],
- }
- }
+ },
+ },
}
diff --git a/host/magma/magma_dec/Android.bp b/host/magma/magma_dec/Android.bp
index f679bb5..7f98fae 100644
--- a/host/magma/magma_dec/Android.bp
+++ b/host/magma/magma_dec/Android.bp
@@ -3,10 +3,10 @@
}
cc_library_static {
- name: "gfxstream_magma_dec",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_magma_dec",
+ defaults: ["gfxstream_defaults"],
static_libs: [
- "gfxstream_apigen_codec_common",
+ "libgfxstream_host_apigen_codec_common",
],
srcs: [
"magma_dec.cpp",
diff --git a/host/renderControl_dec/Android.bp b/host/renderControl_dec/Android.bp
index c123fec..6cf0ca7 100644
--- a/host/renderControl_dec/Android.bp
+++ b/host/renderControl_dec/Android.bp
@@ -8,8 +8,8 @@
}
cc_library_static {
- name: "gfxstream_renderControl_dec",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_rendercontrol_dec",
+ defaults: ["gfxstream_defaults"],
header_libs: [
"gfxstream_opengl_headers",
],
@@ -17,7 +17,7 @@
"gfxstream_opengl_headers",
],
static_libs: [
- "gfxstream_apigen_codec_common",
+ "libgfxstream_host_apigen_codec_common",
],
srcs: [
"renderControl_dec.cpp",
diff --git a/host/testlibs/Android.bp b/host/testlibs/Android.bp
index b7279fd..47e881d 100644
--- a/host/testlibs/Android.bp
+++ b/host/testlibs/Android.bp
@@ -13,8 +13,8 @@
}
cc_test_library {
- name: "gfxstream_oswindow_test_support",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_oswindow_test_support",
+ defaults: ["gfxstream_defaults"],
header_libs: [
"gfxstream_opengl_headers",
],
diff --git a/host/vulkan/Android.bp b/host/vulkan/Android.bp
index f8e9d12..b40cb90 100644
--- a/host/vulkan/Android.bp
+++ b/host/vulkan/Android.bp
@@ -10,21 +10,21 @@
}
cc_library_static {
- name: "gfxstream_vulkan_server",
+ name: "libgfxstream_host_vulkan_server",
defaults: ["gfxstream_defaults"],
header_libs: [
"gfxstream_gl_host_common_headers",
"gfxstream_opengl_headers",
- "gfxstream_vulkan_cereal_common",
+ "libgfxstream_host_vulkan_cereal_common",
],
static_libs: [
"gfxstream_base",
- "gfxstream_glm",
- "gfxstream_compressedTextures",
- "gfxstream_emulated_textures",
+ "libgfxstream_thirdparty_glm",
+ "libgfxstream_host_compressedtextures",
+ "libgfxstream_host_vulkan_emulatedtextures",
"gfxstream_host_common",
- "gfxstream_apigen_codec_common",
- "gfxstream_vulkan_cereal_host",
+ "libgfxstream_host_apigen_codec_common",
+ "libgfxstream_host_vulkan_cereal",
],
cflags: [
"-fvisibility=hidden",
@@ -84,9 +84,9 @@
"liblog",
],
static_libs: [
- "gfxstream_glm",
+ "libgfxstream_thirdparty_glm",
"gfxstream_host_common",
- "gfxstream_vulkan_server",
+ "libgfxstream_host_vulkan_server",
"libgtest",
"libgmock",
],
diff --git a/host/vulkan/cereal/Android.bp b/host/vulkan/cereal/Android.bp
index a8072a5..1f90cfb 100644
--- a/host/vulkan/cereal/Android.bp
+++ b/host/vulkan/cereal/Android.bp
@@ -8,7 +8,7 @@
}
cc_library_static {
- name: "gfxstream_vulkan_cereal_host",
+ name: "libgfxstream_host_vulkan_cereal",
defaults: ["gfxstream_defaults"],
static_libs: ["gfxstream_base"],
srcs: [
@@ -20,11 +20,11 @@
"common/goldfish_vk_transform.cpp",
],
header_libs: [
- "gfxstream_vulkan_headers",
- "gfxstream_vulkan_cereal_common",
+ "libgfxstream_vulkan_headers",
+ "libgfxstream_host_vulkan_cereal_common",
],
export_header_lib_headers: [
- "gfxstream_vulkan_headers",
+ "libgfxstream_vulkan_headers",
],
cflags: [
"-DVK_ANDROID_native_buffer",
diff --git a/host/vulkan/cereal/common/Android.bp b/host/vulkan/cereal/common/Android.bp
index b05f0c3..0ba0643 100644
--- a/host/vulkan/cereal/common/Android.bp
+++ b/host/vulkan/cereal/common/Android.bp
@@ -8,7 +8,7 @@
}
cc_library_headers {
- name: "gfxstream_vulkan_cereal_common",
+ name: "libgfxstream_host_vulkan_cereal_common",
vendor_available: true,
host_supported: true,
export_include_dirs: [
diff --git a/host/vulkan/emulated_textures/Android.bp b/host/vulkan/emulated_textures/Android.bp
index 053b7da..4b24604 100644
--- a/host/vulkan/emulated_textures/Android.bp
+++ b/host/vulkan/emulated_textures/Android.bp
@@ -8,10 +8,10 @@
}
cc_library_static {
- name: "gfxstream_emulated_textures",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_host_vulkan_emulatedtextures",
+ defaults: ["gfxstream_defaults"],
header_libs: [
- "gfxstream_vulkan_cereal_common",
+ "libgfxstream_host_vulkan_cereal_common",
],
srcs: [
"AstcTexture.cpp",
diff --git a/third-party/astc-encoder/Android.bp b/third-party/astc-encoder/Android.bp
index 2c5baac..9c02c41 100644
--- a/third-party/astc-encoder/Android.bp
+++ b/third-party/astc-encoder/Android.bp
@@ -31,4 +31,4 @@
],
}
-// TODO(gregschlom) Write the rules to actually build this library
\ No newline at end of file
+// TODO(gregschlom) Write the rules to actually build this library
diff --git a/third-party/glm/Android.bp b/third-party/glm/Android.bp
index 2c6af2f..6eb20bb 100644
--- a/third-party/glm/Android.bp
+++ b/third-party/glm/Android.bp
@@ -8,7 +8,7 @@
}
cc_library_static {
- name: "gfxstream_glm",
+ name: "libgfxstream_thirdparty_glm",
defaults: ["gfxstream_defaults"],
- export_include_dirs: [ "include" ],
+ export_include_dirs: ["include"],
}
diff --git a/third-party/renderdoc/Android.bp b/third-party/renderdoc/Android.bp
index 725ee2d..ebfdc36 100644
--- a/third-party/renderdoc/Android.bp
+++ b/third-party/renderdoc/Android.bp
@@ -16,9 +16,12 @@
}
cc_library_headers {
- name: "gfxstream_renderdoc_headers",
+ name: "libgfxstream_thirdparty_renderdoc_headers",
defaults: ["gfxstream_defaults"],
vendor_available: true,
host_supported: true,
- export_include_dirs: [ ".", "include" ],
+ export_include_dirs: [
+ ".",
+ "include",
+ ],
}
diff --git a/third-party/stb/Android.bp b/third-party/stb/Android.bp
index e50cd85..034f32a 100644
--- a/third-party/stb/Android.bp
+++ b/third-party/stb/Android.bp
@@ -15,13 +15,13 @@
}
cc_library {
- name: "libgfxstream_stb",
- defaults: [ "gfxstream_defaults" ],
+ name: "libgfxstream_thirdparty_stb",
+ defaults: ["gfxstream_defaults"],
srcs: [
"src/stb_image.cpp",
"src/stb_image_write.cpp",
],
export_include_dirs: [
"include",
- ]
+ ],
}
