diff options
author | Greg Hartman <ghartman@google.com> | 2018-10-12 23:09:58 -0700 |
---|---|---|
committer | Greg Hartman <ghartman@google.com> | 2018-10-15 18:46:09 -0700 |
commit | b8b13e8c7ed6201565f4435136d64a47a7668648 (patch) | |
tree | 159dafe47de84db639a4deb2cfb621f49732aa11 | |
parent | 04f04993a25e7494996a04611db9c5a9cc650792 (diff) | |
download | device_generic_opengl-transport-b8b13e8c7ed6201565f4435136d64a47a7668648.tar.gz device_generic_opengl-transport-b8b13e8c7ed6201565f4435136d64a47a7668648.tar.bz2 device_generic_opengl-transport-b8b13e8c7ed6201565f4435136d64a47a7668648.zip |
Hack to allow compilation on oreo and oreo-mr1
Change-Id: I2ddf71162da32b99e4c5f23bc0e505bcc43fb75e
Test: Compiles
-rw-r--r-- | host/commands/Android.bp | 14 | ||||
-rw-r--r-- | host/libs/virglrenderer/Android.bp | 34 | ||||
-rwxr-xr-x | host/libs/virglrenderer/gen_entries.py (renamed from host/commands/gen_entries.py) | 0 |
3 files changed, 16 insertions, 32 deletions
diff --git a/host/commands/Android.bp b/host/commands/Android.bp index 485e2ef26..ddca16065 100644 --- a/host/commands/Android.bp +++ b/host/commands/Android.bp @@ -16,17 +16,3 @@ subdirs = [ "emugen", ] - -python_binary_host { - name: "gen_entries_cuttlefish", - srcs: ["gen_entries.py"], - main: "gen_entries.py", - version: { - py2: { - enabled: true, - }, - py3: { - enabled: false, - }, - }, -} diff --git a/host/libs/virglrenderer/Android.bp b/host/libs/virglrenderer/Android.bp index 6c31b7a02..b0f5d03ff 100644 --- a/host/libs/virglrenderer/Android.bp +++ b/host/libs/virglrenderer/Android.bp @@ -89,68 +89,66 @@ genrule { ], } -// 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)", + tool_files: ["gen_entries.py"], + cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --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)", + tool_files: ["gen_entries.py"], + cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --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)", + tool_files: ["gen_entries.py"], + cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --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)", + tool_files: ["gen_entries.py"], + cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --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)", + tool_files: ["gen_entries.py"], + cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --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)", + tool_files: ["gen_entries.py"], + cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --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)", + tool_files: ["gen_entries.py"], + cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --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)", + tool_files: ["gen_entries.py"], + cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)", srcs: ["OpenGLESDispatch/gles2_core.entries"], out: ["gles2_core_functions.h"], } diff --git a/host/commands/gen_entries.py b/host/libs/virglrenderer/gen_entries.py index fbfdb4daf..fbfdb4daf 100755 --- a/host/commands/gen_entries.py +++ b/host/libs/virglrenderer/gen_entries.py |