commit 640e28160377ba5f526b57cd80e48c01e30d8ebc
author Jason Macnak <natsu@google.com> Thu May 09 15:11:46 2024 +0000
committer Copybara-Service <copybara-worker@google.com> Thu May 09 08:12:38 2024 -0700
tree 2254e4e7f707ddaff76df3d95be59a6b8dc4487a
parent d1cfa7693ef98c2545584a8a070cd32560e011f6

Merge "Separate magma bits into a separate build target on Android" into main

GitOrigin-RevId: 4a70c4e135dba98a6e387a65fac5c26f987490f9
Change-Id: I88d6eed4788ab004a19464fffda10460eacc680b

host/Android.bp

diff --git a/host/Android.bp b/host/Android.bp
index 82054ff..ebdf6e8 100644
--- a/host/Android.bp
+++ b/host/Android.bp
@@ -35,8 +35,6 @@
     "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",
@@ -44,8 +42,13 @@
     "libgfxstream_thirdparty_glm",
 ]
 
-cc_library {
-    name: "libgfxstream_backend",
+gfxstream_backend_magma_static_deps = [
+    "libgfxstream_host_magma_dec",
+    "libgfxstream_host_magma_server",
+]
+
+cc_defaults {
+    name: "libgfxstream_backend_defaults",
     defaults: ["gfxstream_defaults"],
     vendor_available: true,
     cflags: [
@@ -73,7 +76,6 @@
         "libgfxstream_host_gl_host_common",
         "libgfxstream_host_gles2_dec",
         "libgfxstream_host_glsnapshot",
-        "libgfxstream_host_magma_server",
         "libgfxstream_host_vulkan_cereal",
     ],
     shared_libs: [
@@ -98,7 +100,6 @@
         "RenderThread.cpp",
         "RenderThreadInfo.cpp",
         "RenderThreadInfoGl.cpp",
-        "RenderThreadInfoMagma.cpp",
         "RingStream.cpp",
         "SyncThread.cpp",
         "RenderControl.cpp",
@@ -125,6 +126,23 @@
     },
 }
 
+cc_library {
+    name: "libgfxstream_backend",
+    defaults: ["libgfxstream_backend_defaults"],
+}
+
+cc_library {
+    name: "libgfxstream_backend_magma",
+    defaults: ["libgfxstream_backend_defaults"],
+    static: {
+        whole_static_libs: gfxstream_backend_magma_static_deps,
+    },
+    shared: {
+        static_libs: gfxstream_backend_magma_static_deps,
+    },
+    export_static_lib_headers: gfxstream_backend_magma_static_deps,
+}
+
 cc_test_library {
     name: "gfxstream_backend_test_support",
     defaults: ["gfxstream_defaults"],
@@ -263,7 +281,7 @@
     ],
     shared_libs: [
         "libbase",
-        "libgfxstream_backend",
+        "libgfxstream_backend_magma",
     ],
     test_suites: [
         "general-tests",