diff options
author | Cody Schuffelen <schuffelen@google.com> | 2018-11-19 15:54:12 -0800 |
---|---|---|
committer | Cody Schuffelen <schuffelen@google.com> | 2018-11-19 15:54:12 -0800 |
commit | 816a8bb0375be3c581cb7b1ab77b377cf51d4714 (patch) | |
tree | 30c4986464e4db6a41e3afce4be5e5d53d3238be | |
parent | d282cb97c84b804d72c35612bd905c19200f6205 (diff) | |
parent | 286422f8ce1fdcb26c140ab8b999ce5fa77b0536 (diff) | |
download | device_generic_opengl-transport-816a8bb0375be3c581cb7b1ab77b377cf51d4714.tar.gz device_generic_opengl-transport-816a8bb0375be3c581cb7b1ab77b377cf51d4714.tar.bz2 device_generic_opengl-transport-816a8bb0375be3c581cb7b1ab77b377cf51d4714.zip |
Merge ab/5111269 into masterandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1
Test: TH
Bug: 119522286
Change-Id: I0481b3f41b2c4895b88bdd8a58d32ae02769bca7
-rw-r--r-- | Android.bp | 18 | ||||
-rw-r--r-- | host/Android.bp | 20 | ||||
-rw-r--r-- | host/commands/Android.bp | 14 | ||||
-rw-r--r-- | host/libs/virglrenderer/Android.bp | 40 | ||||
-rwxr-xr-x | host/libs/virglrenderer/gen_entries.py (renamed from host/commands/gen_entries.py) | 0 |
5 files changed, 58 insertions, 34 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 000000000..7f25a9135 --- /dev/null +++ b/Android.bp @@ -0,0 +1,18 @@ +// +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +subdirs = [ + "host", +] diff --git a/host/Android.bp b/host/Android.bp index 5464fac40..b2fe7a4e8 100644 --- a/host/Android.bp +++ b/host/Android.bp @@ -1,3 +1,23 @@ +// +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +subdirs = [ + "commands", + "libs", +] + cc_library_headers { name: "virtio_gpu_uapi_headers", host_supported: true, 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..e66086041 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"], } @@ -181,8 +179,6 @@ cc_library_host_shared { ], 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", @@ -205,4 +201,8 @@ cc_library_host_shared { "virtio_gpu_uapi_headers", "virgl_headers" ], + + // TODO(b/118466250): Make this work on the Mac + version_script : "libvirglrenderer.lds", + defaults: [ "cuttlefish_host_only" ], } 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 |