Android: gallium_dri: add include to get "util/options.h"

Submitted by Mauro Rossi on Dec. 17, 2017, 11:11 p.m.

Details

Message ID 20171217231122.30683-1-issor.oruam@gmail.com
State New
Headers show
Series "Android: gallium_dri: add include to get "util/options.h"" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Mauro Rossi Dec. 17, 2017, 11:11 p.m.
target.c requires "util/options.h" generated header
or the following tricky Android building error may appear:

In file included from external/mesa/src/gallium/targets/dri/target.c:1:
In file included from external/mesa/src/gallium/auxiliary/target-helpers/drm_helper.h:185:
out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_pipe_radeonsi_intermediates/radeonsi/si_driinfo.h:19:7: error: expected '}'
      DRI_CONF_RADEONSI_ENABLE_SISCHED("false")
      ^
external/mesa/src/gallium/auxiliary/target-helpers/drm_helper.h:182:55: note: to match this '{'
   static const struct drm_conf_ret xml_options_ret = {
                                                      ^
1 error generated.

Fixes: 0f8c5de869 ("radeonsi: prepare for driver-specific driconf options")

Cc: "17.3" <mesa-stable@lists.freedesktop.org>
---
 src/gallium/targets/dri/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index d9923043af..a5b5f92ea0 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -26,10 +26,10 @@  LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := gallium_dri
-
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
 LOCAL_SRC_FILES := target.c
-
+LOCAL_C_INCLUDES := $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_util,,)
 LOCAL_CFLAGS :=
 
 # We need --undefined-version as some functions in dri.sym may be missing

Comments

Hi, minor self-review and correction the needed header is
"xmlpool/options.h"
Only changes needed are in the commit title ...

2017-12-18 0:11 GMT+01:00 Mauro Rossi <issor.oruam@gmail.com>:

> target.c requires "xmlpool/options.h" generated header
>

...and here

target.c requires "util/options.h" generated header


> or the following tricky Android building error may appear:
>
> In file included from external/mesa/src/gallium/targets/dri/target.c:1:
> In file included from external/mesa/src/gallium/
> auxiliary/target-helpers/drm_helper.h:185:
> out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_pipe_
> radeonsi_intermediates/radeonsi/si_driinfo.h:19:7: error: expected '}'
>       DRI_CONF_RADEONSI_ENABLE_SISCHED("false")
>       ^
> external/mesa/src/gallium/auxiliary/target-helpers/drm_helper.h:182:55:
> note: to match this '{'
>    static const struct drm_conf_ret xml_options_ret = {
>                                                       ^
> 1 error generated.
>
> Fixes: 0f8c5de869 ("radeonsi: prepare for driver-specific driconf options")
>
> Cc: "17.3" <mesa-stable@lists.freedesktop.org>
> ---
>  src/gallium/targets/dri/Android.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/
> Android.mk
> index d9923043af..a5b5f92ea0 100644
> --- a/src/gallium/targets/dri/Android.mk
> +++ b/src/gallium/targets/dri/Android.mk
> @@ -26,10 +26,10 @@ LOCAL_PATH := $(call my-dir)
>  include $(CLEAR_VARS)
>
>  LOCAL_MODULE := gallium_dri
> -
> +LOCAL_MODULE_CLASS := SHARED_LIBRARIES
>  LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
>  LOCAL_SRC_FILES := target.c
> -
> +LOCAL_C_INCLUDES := $(call generated-sources-dir-for,
> STATIC_LIBRARIES,libmesa_util,,)
>  LOCAL_CFLAGS :=
>
>  # We need --undefined-version as some functions in dri.sym may be missing
> --
> 2.14.1
>
>
Sorry for the typos, anyway I'm sending corrected title and message in new
thread.
Closing this one

Mauro

2017-12-18 0:20 GMT+01:00 Mauro Rossi <issor.oruam@gmail.com>:

> Hi, minor self-review and correction the needed header is
> "xmlpool/options.h"
> Only changes needed are in the commit title ...
>
> 2017-12-18 0:11 GMT+01:00 Mauro Rossi <issor.oruam@gmail.com>:
>
>> target.c requires "xmlpool/options.h" generated header
>>
>
> ...and here
>
> target.c requires "util/options.h" generated header
>
>
>> or the following tricky Android building error may appear:
>>
>> In file included from external/mesa/src/gallium/targets/dri/target.c:1:
>> In file included from external/mesa/src/gallium/auxi
>> liary/target-helpers/drm_helper.h:185:
>> out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_pipe_
>> radeonsi_intermediates/radeonsi/si_driinfo.h:19:7: error: expected '}'
>>       DRI_CONF_RADEONSI_ENABLE_SISCHED("false")
>>       ^
>> external/mesa/src/gallium/auxiliary/target-helpers/drm_helper.h:182:55:
>> note: to match this '{'
>>    static const struct drm_conf_ret xml_options_ret = {
>>                                                       ^
>> 1 error generated.
>>
>> Fixes: 0f8c5de869 ("radeonsi: prepare for driver-specific driconf
>> options")
>>
>> Cc: "17.3" <mesa-stable@lists.freedesktop.org>
>> ---
>>  src/gallium/targets/dri/Android.mk | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/gallium/targets/dri/Android.mk
>> b/src/gallium/targets/dri/Android.mk
>> index d9923043af..a5b5f92ea0 100644
>> --- a/src/gallium/targets/dri/Android.mk
>> +++ b/src/gallium/targets/dri/Android.mk
>> @@ -26,10 +26,10 @@ LOCAL_PATH := $(call my-dir)
>>  include $(CLEAR_VARS)
>>
>>  LOCAL_MODULE := gallium_dri
>> -
>> +LOCAL_MODULE_CLASS := SHARED_LIBRARIES
>>  LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH)
>>  LOCAL_SRC_FILES := target.c
>> -
>> +LOCAL_C_INCLUDES := $(call generated-sources-dir-for,STAT
>> IC_LIBRARIES,libmesa_util,,)
>>  LOCAL_CFLAGS :=
>>
>>  # We need --undefined-version as some functions in dri.sym may be missing
>> --
>> 2.14.1
>>
>>
>