commit 2455c0a9779fd028ea828b246803624f9ae3ed03
author Jason Macnak <natsu@google.com> Tue Sep 12 17:17:16 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 12 17:17:16 2023 +0000
tree 5edcc0749fb9a23854a7f20a3d3dc943b2b59742
parent 60221f21abb2350fd0bb30b5b2f2eb4d038d393c
parent c6b52543c08181fa0307432f45876f80ac500970

Merge changes from topic "gfxstream-end2end-tests" into main

* changes:
  Update namespace in libandroidemu to gfxstream::guest
  Migrate Gfxstream guest libraries to Android.bp

system/codecs/c2/service/Android.bp

diff --git a/system/codecs/c2/service/Android.bp b/system/codecs/c2/service/Android.bp
index 8333a31..310274f 100644
--- a/system/codecs/c2/service/Android.bp
+++ b/system/codecs/c2/service/Android.bp
@@ -33,5 +33,5 @@
         "libutils",
     ],
 
-    required: ["android.hardware.media.c2@1.2-default-seccomp_policy"],
+    required: ["android.hardware.media.c2-default-seccomp_policy"],
 }

system/hals/Android.mk

diff --git a/system/hals/Android.mk b/system/hals/Android.mk
index 2b939a3..1c5ed51 100644
--- a/system/hals/Android.mk
+++ b/system/hals/Android.mk
@@ -44,6 +44,7 @@
 LOCAL_C_INCLUDES += \
     hardware/google/gfxstream/guest/GoldfishAddressSpace/include \
     hardware/google/gfxstream/guest/include \
+    hardware/google/gfxstream/guest/platform/include \
     hardware/google/gfxstream/guest/iostream/include/libOpenglRender \
     hardware/google/gfxstream/guest/OpenglCodecCommon \
     hardware/google/gfxstream/guest/OpenglSystemCommon \
@@ -85,6 +86,7 @@
 LOCAL_C_INCLUDES += \
     hardware/google/gfxstream/guest/GoldfishAddressSpace/include \
     hardware/google/gfxstream/guest/include \
+    hardware/google/gfxstream/guest/platform/include \
     hardware/google/gfxstream/guest/iostream/include/libOpenglRender \
     hardware/google/gfxstream/guest/OpenglCodecCommon \
     hardware/google/gfxstream/guest/OpenglSystemCommon \

system/hwc3/Android.mk

diff --git a/system/hwc3/Android.mk b/system/hwc3/Android.mk
index 0a4d1d8..1ed4cb7 100644
--- a/system/hwc3/Android.mk
+++ b/system/hwc3/Android.mk
@@ -69,6 +69,7 @@
     hardware/google/gfxstream/guest/iostream/include/libOpenglRender \
     hardware/google/gfxstream/guest/OpenglCodecCommon \
     hardware/google/gfxstream/guest/OpenglSystemCommon \
+    hardware/google/gfxstream/guest/platform/include \
     hardware/google/gfxstream/guest/renderControl_enc \
     system/core/libsync \
     system/core/libsync/include \