From 681a6f9804d295915d1ee6dfbbc13bd4e802a5a2 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 23 Mar 2021 22:49:58 -0700 Subject: Use $(location) to find path to tools Hardcoding the full path to the tool is incorrect when the tool is sandboxed, use $(location) instead. Test: builds Change-Id: I5d150a52b84f6926726768ba7aadfc2522d561fd --- host/libs/virglrenderer/Android.bp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/host/libs/virglrenderer/Android.bp b/host/libs/virglrenderer/Android.bp index 3791f7aa6..c05b1e5cf 100644 --- a/host/libs/virglrenderer/Android.bp +++ b/host/libs/virglrenderer/Android.bp @@ -102,7 +102,7 @@ genrule { genrule { name: "gles1_core_functions_hdr", tool_files: ["gen_entries.py"], - cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)", + cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)", srcs: ["OpenGLESDispatch/gles1_core.entries"], out: ["gles1_core_functions.h"], } @@ -110,7 +110,7 @@ genrule { genrule { name: "gles1_extensions_functions_hdr", tool_files: ["gen_entries.py"], - cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)", + cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)", srcs: ["OpenGLESDispatch/gles1_extensions.entries"], out: ["gles1_extensions_functions.h"], } @@ -118,7 +118,7 @@ genrule { genrule { name: "egl_functions_hdr", tool_files: ["gen_entries.py"], - cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)", + cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)", srcs: ["OpenGLESDispatch/egl.entries"], out: ["egl_functions.h"], } @@ -126,7 +126,7 @@ genrule { genrule { name: "gles3_only_functions_hdr", tool_files: ["gen_entries.py"], - cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)", + cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)", srcs: ["OpenGLESDispatch/gles3_only.entries"], out: ["gles3_only_functions.h"], } @@ -134,7 +134,7 @@ genrule { genrule { name: "gles31_only_functions_hdr", tool_files: ["gen_entries.py"], - cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)", + cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)", srcs: ["OpenGLESDispatch/gles31_only.entries"], out: ["gles31_only_functions.h"], } @@ -142,7 +142,7 @@ genrule { genrule { name: "gles2_extensions_functions_hdr", tool_files: ["gen_entries.py"], - cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)", + cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)", srcs: ["OpenGLESDispatch/gles2_extensions.entries"], out: ["gles2_extensions_functions.h"], } @@ -150,7 +150,7 @@ genrule { genrule { name: "egl_extensions_functions_hdr", tool_files: ["gen_entries.py"], - cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)", + cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)", srcs: ["OpenGLESDispatch/egl_extensions.entries"], out: ["egl_extensions_functions.h"], } @@ -158,7 +158,7 @@ genrule { genrule { name: "gles2_core_functions_hdr", tool_files: ["gen_entries.py"], - cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)", + cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)", srcs: ["OpenGLESDispatch/gles2_core.entries"], out: ["gles2_core_functions.h"], } -- cgit v1.2.3