gfxstream-base/host-common -> aemu-base/host-common.

Bug: 237805597
Test: presubmit
Change-Id: I0ec7e0ba6ec9aeb5a23f20391b8524f87e4f343b

17 files changed, 34 insertions, 34 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67c01a21..6630124c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ option(BUILD_STANDALONE "Build with standalone implementations of base/host-comm
 if (BUILD_STANDALONE)
     # These libraries may be changed in non-standalone builds to inject another implementation of
     # these APIs.
-    set(GFXSTREAM_BASE_LIB gfxstream-base)
-    set(GFXSTREAM_HOST_COMMON_LIB gfxstream-host-common)
+    set(GFXSTREAM_BASE_LIB aemu-base)
+    set(GFXSTREAM_HOST_COMMON_LIB aemu-host-common)
 endif()
 
 if (WIN32)
diff --git a/fake-android-guest/CMakeLists.txt b/fake-android-guest/CMakeLists.txt
index 1a2b8d21..f570065f 100644
--- a/fake-android-guest/CMakeLists.txt
+++ b/fake-android-guest/CMakeLists.txt
@@ -21,14 +21,14 @@ add_library(
     androidImpl/Unicode.cpp)
 target_include_directories(cutils PRIVATE ${GFXSTREAM_REPO_ROOT} ${GFXSTREAM_REPO_ROOT}/include .)
 target_include_directories(cutils PUBLIC .)
-target_link_libraries(cutils PUBLIC gfxstream-base.headers)
+target_link_libraries(cutils PUBLIC aemu-base.headers)
 target_link_libraries(cutils PRIVATE log gfxstream_vulkan_headers)
 target_compile_options(cutils PRIVATE -fvisibility=default -Wno-invalid-constexpr -Wno-macro-redefined)
 target_compile_definitions(cutils PRIVATE -D__ANDROID_API__=28)
 
 add_library(grallocusage SHARED libgrallocusage/GrallocUsageConversion.cpp)
 target_include_directories(grallocusage PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(grallocusage PUBLIC gfxstream-base.headers)
+target_link_libraries(grallocusage PUBLIC aemu-base.headers)
 target_compile_definitions(grallocusage PRIVATE -D__ANDROID_API__=28)
 
 # The gui library
@@ -47,7 +47,7 @@ add_library(gui
     androidImpl/SurfaceFlinger.cpp
     androidImpl/Vsync.cpp
     sync/sync.cpp)
-target_link_libraries(gui PUBLIC gfxstream-base.headers)
+target_link_libraries(gui PUBLIC aemu-base.headers)
 target_include_directories(gui PUBLIC ${GFXSTREAM_REPO_ROOT}/fake-android-guest)
 target_compile_options(gui PRIVATE -fvisibility=default)
 target_compile_definitions(gui PRIVATE -D__ANDROID_API__=28)
@@ -78,7 +78,7 @@ target_compile_options(vulkan_android PRIVATE -fvisibility=hidden
                                               -fstrict-aliasing)
 target_link_libraries(vulkan_android PRIVATE grallocusage)
 target_link_libraries(vulkan_android
-                      PUBLIC gfxstream-base.headers log gui cutils utils gfxstream_vulkan_headers)
+                      PUBLIC aemu-base.headers log gui cutils utils gfxstream_vulkan_headers)
 
 # android_add_test(
 #   TARGET vulkanhal_unittests SRC # cmake-format: sortable
diff --git a/protocols/generic-apigen/CMakeLists.txt b/protocols/generic-apigen/CMakeLists.txt
index 8bcc5855..2aaa6cac 100644
--- a/protocols/generic-apigen/CMakeLists.txt
+++ b/protocols/generic-apigen/CMakeLists.txt
@@ -2,5 +2,5 @@ add_executable(
   gfxstream-generic-apigen
   ApiGen.cpp EntryPoint.cpp getopt.c main.cpp Parser.cpp strUtils.cpp TypeFactory.cpp)
 target_include_directories(gfxstream-generic-apigen PRIVATE ../..)
-target_link_libraries(gfxstream-generic-apigen PRIVATE gfxstream-base.headers)
+target_link_libraries(gfxstream-generic-apigen PRIVATE aemu-base.headers)
 install(TARGETS gfxstream-generic-apigen DESTINATION ${PROJECT_BINARY_DIR})
diff --git a/scripts/generate-vulkan-sources.sh b/scripts/generate-vulkan-sources.sh
index 8bf99650..0f935237 100755
--- a/scripts/generate-vulkan-sources.sh
+++ b/scripts/generate-vulkan-sources.sh
@@ -34,8 +34,8 @@ export VK_CEREAL_HOST_DECODER_DIR=$REPO_DIR/stream-servers/vulkan
 export VK_CEREAL_HOST_PROTO_DIR=$REPO_DIR/stream-servers/vulkan/cereal/proto
 export VK_CEREAL_HOST_INCLUDE_DIR=$REPO_DIR/include
 export VK_CEREAL_BASELIB_PREFIX=base
-export VK_CEREAL_BASELIB_LINKNAME=gfxstream-base.headers
-export VK_CEREAL_HOST_COMMON_LIB_LINKNAME=gfxstream-host-common.headers
+export VK_CEREAL_BASELIB_LINKNAME=aemu-base.headers
+export VK_CEREAL_HOST_COMMON_LIB_LINKNAME=aemu-host-common.headers
 
 mkdir -p $CEREAL_OUTPUT_DIR
 
diff --git a/stream-servers/CMakeLists.txt b/stream-servers/CMakeLists.txt
index 53fe3f91..c9d159e0 100644
--- a/stream-servers/CMakeLists.txt
+++ b/stream-servers/CMakeLists.txt
@@ -125,7 +125,7 @@ if (ENABLE_VKCEREAL_TESTS)
         PRIVATE
         OSWindow
         gfxstream_backend
-        gfxstream-host-common-testing-support
+        aemu-host-common-testing-support
         ${GFXSTREAM_BASE_LIB}
         gtest_main)
     gtest_discover_tests(gfxstream_backend_unittests)
@@ -159,7 +159,7 @@ target_include_directories(
 target_link_libraries(
     stream-server-testing-support
     PUBLIC
-    gfxstream-base-testing-support
+    aemu-base-testing-support
     gfxstream_backend_static
     gfxstream_stb
     OSWindow
@@ -171,7 +171,7 @@ add_library(
     tests/X11TestingSupport.cpp)
 target_link_libraries(
     x11_testing_support
-    gfxstream-base.headers)
+    aemu-base.headers)
 endif()
 
 if (ENABLE_VKCEREAL_TESTS)
@@ -188,8 +188,8 @@ if (ENABLE_VKCEREAL_TESTS)
         PRIVATE
         gfxstream_backend_static
         stream-server-testing-support
-        gfxstream-base-testing-support
-        gfxstream-host-common-testing-support
+        aemu-base-testing-support
+        aemu-host-common-testing-support
         gtest_main)
     if (LINUX)
         target_link_libraries(
@@ -221,8 +221,8 @@ if (ENABLE_VKCEREAL_TESTS)
         PRIVATE
         gfxstream_backend_static
         stream-server-testing-support
-        gfxstream-base-testing-support
-        gfxstream-host-common-testing-support
+        aemu-base-testing-support
+        aemu-host-common-testing-support
         gtest_main)
     gtest_discover_tests(OpenglRender_snapshot_unittests)
 
@@ -244,8 +244,8 @@ if (ENABLE_VKCEREAL_TESTS)
         PRIVATE
         gfxstream_backend_static
         stream-server-testing-support
-        gfxstream-base-testing-support
-        gfxstream-host-common-testing-support
+        aemu-base-testing-support
+        aemu-host-common-testing-support
         gtest
         gtest_main
         gmock)
diff --git a/stream-servers/apigen-codec-common/CMakeLists.txt b/stream-servers/apigen-codec-common/CMakeLists.txt
index a449038f..01284eff 100644
--- a/stream-servers/apigen-codec-common/CMakeLists.txt
+++ b/stream-servers/apigen-codec-common/CMakeLists.txt
@@ -19,8 +19,8 @@ endif()
 target_link_libraries(
     apigen-codec-common
     PUBLIC
-    gfxstream-host-common.headers
-    gfxstream-base.headers)
+    aemu-host-common.headers
+    aemu-base.headers)
 target_include_directories(
     apigen-codec-common
     PUBLIC
diff --git a/stream-servers/compressedTextureFormats/CMakeLists.txt b/stream-servers/compressedTextureFormats/CMakeLists.txt
index e6b8f21f..ef20067c 100644
--- a/stream-servers/compressedTextureFormats/CMakeLists.txt
+++ b/stream-servers/compressedTextureFormats/CMakeLists.txt
@@ -26,7 +26,7 @@ target_include_directories(
 target_link_libraries(
     gfxstream-compressedTextures_unittests
     PRIVATE
-    gfxstream-base.headers
+    aemu-base.headers
     gfxstream-compressedTextures
     ${GFXSTREAM_BASE_LIB}
     gtest_main
diff --git a/stream-servers/gl/CMakeLists.txt b/stream-servers/gl/CMakeLists.txt
index 822d61d6..8f798ff1 100644
--- a/stream-servers/gl/CMakeLists.txt
+++ b/stream-servers/gl/CMakeLists.txt
@@ -20,7 +20,7 @@ add_library(gfxstream-gl-server
 target_link_libraries(
         gfxstream-gl-server
         PUBLIC
-        gfxstream-base.headers
+        aemu-base.headers
         gfxstream_vulkan_headers
         gles1_dec
         gles2_dec
diff --git a/stream-servers/gl/OpenGLESDispatch/CMakeLists.txt b/stream-servers/gl/OpenGLESDispatch/CMakeLists.txt
index 13388485..c6f74b5f 100644
--- a/stream-servers/gl/OpenGLESDispatch/CMakeLists.txt
+++ b/stream-servers/gl/OpenGLESDispatch/CMakeLists.txt
@@ -10,6 +10,6 @@ add_library(
 if (NOT MSVC)
     target_compile_options(OpenGLESDispatch PRIVATE -fvisibility=default)
 endif()
-target_link_libraries(OpenGLESDispatch PRIVATE gfxstream-base.headers)
+target_link_libraries(OpenGLESDispatch PRIVATE aemu-base.headers)
 target_link_libraries(OpenGLESDispatch PUBLIC gles1_dec gles2_dec apigen-codec-common)
 target_link_libraries(OpenGLESDispatch PRIVATE EGL_translator_static)
diff --git a/stream-servers/gl/glestranslator/EGL/CMakeLists.txt b/stream-servers/gl/glestranslator/EGL/CMakeLists.txt
index 5033a63d..46e36ae1 100644
--- a/stream-servers/gl/glestranslator/EGL/CMakeLists.txt
+++ b/stream-servers/gl/glestranslator/EGL/CMakeLists.txt
@@ -38,7 +38,7 @@ else()
 endif()
 
 target_link_libraries(EGL_translator_static PUBLIC GLcommon apigen-codec-common)
-target_link_libraries(EGL_translator_static PRIVATE gfxstream-base.headers logging-base)
+target_link_libraries(EGL_translator_static PRIVATE aemu-base.headers logging-base)
 target_link_libraries(EGL_translator_static PUBLIC GLES_CM_translator_static GLES_V2_translator_static)
 if (NOT MSVC)
     target_compile_options(EGL_translator_static PRIVATE -fvisibility=hidden)
diff --git a/stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt b/stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt
index b5bebfb5..db1f96b6 100644
--- a/stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt
+++ b/stream-servers/gl/glestranslator/GLES_CM/CMakeLists.txt
@@ -9,8 +9,8 @@ target_compile_options(GLES_CM_translator_static PRIVATE -Wno-macro-redefined)
 target_link_libraries(
     GLES_CM_translator_static PRIVATE
     apigen-codec-common
-    gfxstream-base.headers
-    gfxstream-host-common.headers
+    aemu-base.headers
+    aemu-host-common.headers
     gfxstream-snapshot.headers)
 target_include_directories(
     GLES_CM_translator_static PRIVATE
diff --git a/stream-servers/gl/glestranslator/GLES_V2/CMakeLists.txt b/stream-servers/gl/glestranslator/GLES_V2/CMakeLists.txt
index 92dbbcf3..8cac4511 100644
--- a/stream-servers/gl/glestranslator/GLES_V2/CMakeLists.txt
+++ b/stream-servers/gl/glestranslator/GLES_V2/CMakeLists.txt
@@ -17,6 +17,6 @@ target_link_libraries(
     GLES_V2_translator_static PRIVATE
     GLcommon
     apigen-codec-common
-    gfxstream-base.headers
-    gfxstream-host-common.headers
+    aemu-base.headers
+    aemu-host-common.headers
     angle_shader_translator)
diff --git a/stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt b/stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt
index e7701179..cc0af8cb 100644
--- a/stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt
+++ b/stream-servers/gl/glestranslator/GLcommon/CMakeLists.txt
@@ -29,8 +29,8 @@ target_include_directories(
     ${GFXSTREAM_REPO_ROOT}/third-party/angle/include)
 target_link_libraries(
     GLcommon PUBLIC
-    gfxstream-base.headers
-    gfxstream-host-common.headers
+    aemu-base.headers
+    aemu-host-common.headers
     gfxstream-snapshot.headers
     gfxstream-compressedTextures)
 if (NOT MSVC)
diff --git a/stream-servers/testlibs/CMakeLists.txt b/stream-servers/testlibs/CMakeLists.txt
index 6ae9a581..ce946589 100644
--- a/stream-servers/testlibs/CMakeLists.txt
+++ b/stream-servers/testlibs/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(
 target_link_libraries(
     OSWindow
     PRIVATE
-    gfxstream-base.headers)
+    aemu-base.headers)
 target_include_directories(
     OSWindow
     PUBLIC
diff --git a/stream-servers/vulkan/CMakeLists.txt b/stream-servers/vulkan/CMakeLists.txt
index 1bf067aa..3af7c68c 100644
--- a/stream-servers/vulkan/CMakeLists.txt
+++ b/stream-servers/vulkan/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(gfxstream-vulkan-server PUBLIC
         gfxstream-compressedTextures
         emulated_textures
         apigen-codec-common
-        gfxstream-base.headers
+        aemu-base.headers
         gfxstream-snapshot.headers
         gfxstream_vulkan_headers)
 
diff --git a/stream-servers/vulkan/cereal/CMakeLists.txt b/stream-servers/vulkan/cereal/CMakeLists.txt
index 9a88be32..3784df96 100644
--- a/stream-servers/vulkan/cereal/CMakeLists.txt
+++ b/stream-servers/vulkan/cereal/CMakeLists.txt
@@ -22,7 +22,7 @@ target_compile_definitions(OpenglRender_vulkan_cereal PRIVATE -DVK_GOOGLE_gfxstr
 if (WIN32)
     target_compile_definitions(OpenglRender_vulkan_cereal PRIVATE -DVK_USE_PLATFORM_WIN32_KHR)
 endif()
-target_link_libraries(OpenglRender_vulkan_cereal PUBLIC gfxstream-base.headers gfxstream_vulkan_headers)
+target_link_libraries(OpenglRender_vulkan_cereal PUBLIC aemu-base.headers gfxstream_vulkan_headers)
 
 target_include_directories(OpenglRender_vulkan_cereal
                            PUBLIC
diff --git a/stream-servers/vulkan/emulated_textures/CMakeLists.txt b/stream-servers/vulkan/emulated_textures/CMakeLists.txt
index 48e92af6..8bebc5ef 100644
--- a/stream-servers/vulkan/emulated_textures/CMakeLists.txt
+++ b/stream-servers/vulkan/emulated_textures/CMakeLists.txt
@@ -4,7 +4,7 @@ add_library(emulated_textures
 
 target_link_libraries(emulated_textures PUBLIC
         OpenglRender_vulkan_cereal
-        gfxstream-base.headers
+        aemu-base.headers
         gfxstream_vulkan_headers)
 
 target_include_directories(emulated_textures