8 files changed, 183 insertions, 18 deletions
diff --git a/host/libs/virglrenderer/AVDVirglRenderer.cpp b/host/libs/virglrenderer/AVDVirglRenderer.cpp
index a089489f8..2be15d5a1 100644
--- a/host/libs/virglrenderer/AVDVirglRenderer.cpp
+++ b/host/libs/virglrenderer/AVDVirglRenderer.cpp
@@ -17,7 +17,7 @@
 
 extern "C" {
 #include <linux/virtio_gpu.h>
-#include <virgl/virglrenderer.h>
+#include <virglrenderer.h>
 #include <virgl_hw.h>
 }
 
diff --git a/host/libs/virglrenderer/Android.bp b/host/libs/virglrenderer/Android.bp
index 7fd35d904..6c31b7a02 100644
--- a/host/libs/virglrenderer/Android.bp
+++ b/host/libs/virglrenderer/Android.bp
@@ -14,30 +14,195 @@
 // limitations under the License.
 //
 
+genrule {
+  name: "glesv1_dec_cuttlefish_gensrc",
+  srcs: ["GLESv1_dec/*"],
+  tools: ["emugen_cuttlefish"],
+  cmd: "$(location emugen_cuttlefish) " +
+       "-i device/generic/opengl-transport/host/libs/virglrenderer/GLESv1_dec " +
+       "-D $(genDir) gles1",
+  out: ["gles1_dec.cpp"],
+}
+
+genrule {
+  name: "glesv1_dec_cuttlefish_genhdr",
+  srcs: ["GLESv1_dec/*"],
+  tools: ["emugen_cuttlefish"],
+  cmd: "$(location emugen_cuttlefish) " +
+       "-i device/generic/opengl-transport/host/libs/virglrenderer/GLESv1_dec " +
+       "-D $(genDir) gles1",
+  out: [
+    "gles1_dec.h",
+    "gles1_opcodes.h",
+    "gles1_server_context.h",
+    "gles1_server_proc.h",
+  ],
+}
+
+genrule {
+  name: "glesv3_dec_cuttlefish_gensrc",
+  srcs: ["GLESv3_dec/*"],
+  tools: ["emugen_cuttlefish"],
+  cmd: "$(location emugen_cuttlefish) " +
+       "-i device/generic/opengl-transport/host/libs/virglrenderer/GLESv3_dec " +
+       "-D $(genDir) gles3",
+  out: ["gles3_dec.cpp"],
+}
+
+genrule {
+  name: "glesv3_dec_cuttlefish_genhdr",
+  srcs: ["GLESv3_dec/*"],
+  tools: ["emugen_cuttlefish"],
+  cmd: "$(location emugen_cuttlefish) " +
+       "-i device/generic/opengl-transport/host/libs/virglrenderer/GLESv3_dec " +
+       "-D $(genDir) gles3",
+  out: [
+    "gles3_dec.h",
+    "gles3_opcodes.h",
+    "gles3_server_context.h",
+    "gles3_server_proc.h",
+  ],
+}
+
+genrule {
+  name: "rendercontrol_dec_cuttlefish_gensrc",
+  srcs: ["renderControl_dec/*"],
+  tools: ["emugen_cuttlefish"],
+  cmd: "$(location emugen_cuttlefish) " +
+       "-i device/generic/opengl-transport/host/libs/virglrenderer/renderControl_dec " +
+       "-D $(genDir) renderControl",
+  out: ["renderControl_dec.cpp"],
+}
+
+genrule {
+  name: "rendercontrol_dec_cuttlefish_genhdr",
+  srcs: ["renderControl_dec/*"],
+  tools: ["emugen_cuttlefish"],
+  cmd: "$(location emugen_cuttlefish) " +
+       "-i device/generic/opengl-transport/host/libs/virglrenderer/renderControl_dec " +
+       "-D $(genDir) renderControl",
+  out: [
+    "renderControl_dec.h",
+    "renderControl_opcodes.h",
+    "renderControl_server_context.h",
+    "renderControl_server_proc.h",
+  ],
+}
+
+// out/host/linux-x86/bin/emugen_cuttlefish -i device/generic/opengl-transport/host/libs/virglrenderer/renderControl_dec -D /tmp/foo renderControl
+
+genrule {
+  name: "gles1_core_functions_hdr",
+  tools: ["gen_entries_cuttlefish"],
+  cmd: "$(location gen_entries_cuttlefish) --mode=funcargs $(in) --output $(out)",
+  srcs: ["OpenGLESDispatch/gles1_core.entries"],
+  out: ["gles1_core_functions.h"],
+}
+
+genrule {
+  name: "gles1_extensions_functions_hdr",
+  tools: ["gen_entries_cuttlefish"],
+  cmd: "$(location gen_entries_cuttlefish) --mode=funcargs $(in) --output $(out)",
+  srcs: ["OpenGLESDispatch/gles1_extensions.entries"],
+  out: ["gles1_extensions_functions.h"],
+}
+
+genrule {
+  name: "egl_functions_hdr",
+  tools: ["gen_entries_cuttlefish"],
+  cmd: "$(location gen_entries_cuttlefish) --mode=funcargs $(in) --output $(out)",
+  srcs: ["OpenGLESDispatch/egl.entries"],
+  out: ["egl_functions.h"],
+}
+
+genrule {
+  name: "gles3_only_functions_hdr",
+  tools: ["gen_entries_cuttlefish"],
+  cmd: "$(location gen_entries_cuttlefish) --mode=funcargs $(in) --output $(out)",
+  srcs: ["OpenGLESDispatch/gles3_only.entries"],
+  out: ["gles3_only_functions.h"],
+}
+
+genrule {
+  name: "gles31_only_functions_hdr",
+  tools: ["gen_entries_cuttlefish"],
+  cmd: "$(location gen_entries_cuttlefish) --mode=funcargs $(in) --output $(out)",
+  srcs: ["OpenGLESDispatch/gles31_only.entries"],
+  out: ["gles31_only_functions.h"],
+}
+
+genrule {
+  name: "gles2_extensions_functions_hdr",
+  tools: ["gen_entries_cuttlefish"],
+  cmd: "$(location gen_entries_cuttlefish) --mode=funcargs $(in) --output $(out)",
+  srcs: ["OpenGLESDispatch/gles2_extensions.entries"],
+  out: ["gles2_extensions_functions.h"],
+}
+
+genrule {
+  name: "egl_extensions_functions_hdr",
+  tools: ["gen_entries_cuttlefish"],
+  cmd: "$(location gen_entries_cuttlefish) --mode=funcargs $(in) --output $(out)",
+  srcs: ["OpenGLESDispatch/egl_extensions.entries"],
+  out: ["egl_extensions_functions.h"],
+}
+
+genrule {
+  name: "gles2_core_functions_hdr",
+  tools: ["gen_entries_cuttlefish"],
+  cmd: "$(location gen_entries_cuttlefish) --mode=funcargs $(in) --output $(out)",
+  srcs: ["OpenGLESDispatch/gles2_core.entries"],
+  out: ["gles2_core_functions.h"],
+}
+
 cc_library_host_shared {
-    name: "libvirglrenderer",
+    name: "libvirglrenderer_cuttlefish",
     include_dirs: [
         "external/libdrm",
         "external/libdrm/include",
         "device/generic/goldfish-opengl/system",
     ],
-    local_include_dirs: [ "include" ],
+    local_include_dirs: [
+      "GLESv1_dec",
+      "GLESv3_dec",
+      "include",
+      "renderControl_dec",
+    ],
     srcs: [
         "AVDVirglRenderer.cpp",
         "ChecksumCalculator.cpp",
         "GLESv1.cpp",
-        "GLESv1_dec/gles1_dec.cpp",
         "GLESv3.cpp",
-        "GLESv3_dec/gles3_dec.cpp",
         "Gralloc1.cpp",
         "OpenGLESDispatch/EGLDispatch.cpp",
         "OpenGLESDispatch/GLESv1Dispatch.cpp",
         "OpenGLESDispatch/GLESv3Dispatch.cpp",
         "RenderControl.cpp",
-        "renderControl_dec/renderControl_dec.cpp",
     ],
     cflags: ["-Wno-unused-parameter", "-DOPENGL_DEBUG_PRINTOUT"],
     host_ldlibs: [ "-ldl" ],
     version_script : "libvirglrenderer.lds",
     defaults: [ "cuttlefish_host_only" ],
+    generated_sources: [
+      "glesv1_dec_cuttlefish_gensrc",
+      "glesv3_dec_cuttlefish_gensrc",
+      "rendercontrol_dec_cuttlefish_gensrc",
+    ],
+    generated_headers: [
+      "glesv1_dec_cuttlefish_genhdr",
+      "glesv3_dec_cuttlefish_genhdr",
+      "rendercontrol_dec_cuttlefish_genhdr",
+      "gles1_core_functions_hdr",
+      "gles1_extensions_functions_hdr",
+      "egl_functions_hdr",
+      "gles3_only_functions_hdr",
+      "gles31_only_functions_hdr",
+      "gles2_extensions_functions_hdr",
+      "egl_extensions_functions_hdr",
+      "gles2_core_functions_hdr",
+    ],
+    header_libs: [
+      "virtio_gpu_uapi_headers",
+      "virgl_headers"
+    ],
 }
diff --git a/host/libs/virglrenderer/GLESv1.h b/host/libs/virglrenderer/GLESv1.h
index f8b90732b..00c1ec42d 100644
--- a/host/libs/virglrenderer/GLESv1.h
+++ b/host/libs/virglrenderer/GLESv1.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "GLESv1_dec/gles1_dec.h"
+#include "gles1_dec.h"
 
 struct GLESv1 : public gles1_decoder_context_t {
     GLESv1();
diff --git a/host/libs/virglrenderer/GLESv3.h b/host/libs/virglrenderer/GLESv3.h
index 33eab48f6..a0778533c 100644
--- a/host/libs/virglrenderer/GLESv3.h
+++ b/host/libs/virglrenderer/GLESv3.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "GLESv3_dec/gles3_dec.h"
+#include "gles3_dec.h"
 
 #include <map>
 
diff --git a/host/libs/virglrenderer/OpenGLESDispatch/EGLDispatch.h b/host/libs/virglrenderer/OpenGLESDispatch/EGLDispatch.h
index eb3cd880a..13c607873 100644
--- a/host/libs/virglrenderer/OpenGLESDispatch/EGLDispatch.h
+++ b/host/libs/virglrenderer/OpenGLESDispatch/EGLDispatch.h
@@ -19,8 +19,8 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-#include <OpenGLESDispatch/egl_functions.h>
-#include <OpenGLESDispatch/egl_extensions_functions.h>
+#include <egl_functions.h>
+#include <egl_extensions_functions.h>
 
 #define EGL_DEFINE_TYPE(return_type, function_name, signature, callargs) \
     typedef return_type(EGLAPIENTRY* function_name##_t) signature;
diff --git a/host/libs/virglrenderer/OpenGLESDispatch/gles_functions.h b/host/libs/virglrenderer/OpenGLESDispatch/gles_functions.h
index d45dda39c..1219391ce 100644
--- a/host/libs/virglrenderer/OpenGLESDispatch/gles_functions.h
+++ b/host/libs/virglrenderer/OpenGLESDispatch/gles_functions.h
@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include "OpenGLESDispatch/gles1_core_functions.h"
-#include "OpenGLESDispatch/gles1_extensions_functions.h"
-#include "OpenGLESDispatch/gles2_core_functions.h"
-#include "OpenGLESDispatch/gles2_extensions_functions.h"
-#include "OpenGLESDispatch/gles3_only_functions.h"
-#include "OpenGLESDispatch/gles31_only_functions.h"
+#include "gles1_core_functions.h"
+#include "gles1_extensions_functions.h"
+#include "gles2_core_functions.h"
+#include "gles2_extensions_functions.h"
+#include "gles3_only_functions.h"
+#include "gles31_only_functions.h"
 
 #define LIST_GLES1_FUNCTIONS(X, Y) \
     LIST_GLES1_CORE_FUNCTIONS(X) \
diff --git a/host/libs/virglrenderer/RenderControl.h b/host/libs/virglrenderer/RenderControl.h
index 146adf49e..88734e568 100644
--- a/host/libs/virglrenderer/RenderControl.h
+++ b/host/libs/virglrenderer/RenderControl.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "renderControl_dec/renderControl_dec.h"
+#include "renderControl_dec.h"
 
 typedef void* EGLDisplay;
 
diff --git a/host/libs/virglrenderer/Resource.h b/host/libs/virglrenderer/Resource.h
index eb127827d..9fd462e71 100644
--- a/host/libs/virglrenderer/Resource.h
+++ b/host/libs/virglrenderer/Resource.h
@@ -17,7 +17,7 @@
 #pragma once
 
 extern "C" {
-#include <virgl/virglrenderer.h>
+#include <virglrenderer.h>
 }
 
 #include <cstdint>