Merge changes from topic "enablehostside" into cuttlefish-testing
* changes:
Hack to allow compilation on oreo and oreo-mr1
Add additional Android.bp files to make libs visible
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..7f25a91
--- /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 5464fac..b2fe7a4 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 485e2ef..ddca160 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 6c31b7a..b0f5d03 100644
--- a/host/libs/virglrenderer/Android.bp
+++ b/host/libs/virglrenderer/Android.bp
@@ -89,68 +89,66 @@
],
}
-// 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
similarity index 100%
rename from host/commands/gen_entries.py
rename to host/libs/virglrenderer/gen_entries.py
