Re: [Mesa-dev] [PATCH 1/2] android: link libmesa_intel_common with zlib and expat

2017-07-31 Thread Tapani Pälli 



On 08/01/2017 12:17 AM, Rob Herring wrote:

On Mon, Jul 31, 2017 at 3:45 PM, Emil Velikov  wrote:

On 31 July 2017 at 09:32, Tapani Pälli  wrote:

Makes it possible to build Mesa on Android with -DDEBUG with
the next patch that reverts 4f695731.

Signed-off-by: Tapani Pälli 
---
  src/intel/Android.common.mk | 5 +
  1 file changed, 5 insertions(+)

diff --git a/src/intel/Android.common.mk b/src/intel/Android.common.mk
index f056f0a..12cea6e 100644
--- a/src/intel/Android.common.mk
+++ b/src/intel/Android.common.mk
@@ -32,10 +32,15 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
  LOCAL_SRC_FILES := $(COMMON_FILES)

  LOCAL_C_INCLUDES := \
+   external/zlib \

Ideally this will be part of zlib's LOCAL_EXPORT_C_INCLUDE_DIRS, at
some point in the future.


FYI, it already is and has been since M. So it depends whether you
care about L support. IMO, with O coming out soon, it's time to drop
L. 3 years/versions of Android support in master seems like plenty to
me.



Yeah, this was to not break L support like with commit 
bfc0c23843008fd510afa263ebe371bef3346445. Android-IA is fine with 
dropping L support, not sure if Android-x86 wants it?


// Tapani
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] android: link libmesa_intel_common with zlib and expat

2017-07-31 Thread Rob Herring 
On Mon, Jul 31, 2017 at 3:45 PM, Emil Velikov  wrote:
> On 31 July 2017 at 09:32, Tapani Pälli  wrote:
>> Makes it possible to build Mesa on Android with -DDEBUG with
>> the next patch that reverts 4f695731.
>>
>> Signed-off-by: Tapani Pälli 
>> ---
>>  src/intel/Android.common.mk | 5 +
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/src/intel/Android.common.mk b/src/intel/Android.common.mk
>> index f056f0a..12cea6e 100644
>> --- a/src/intel/Android.common.mk
>> +++ b/src/intel/Android.common.mk
>> @@ -32,10 +32,15 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
>>  LOCAL_SRC_FILES := $(COMMON_FILES)
>>
>>  LOCAL_C_INCLUDES := \
>> +   external/zlib \
> Ideally this will be part of zlib's LOCAL_EXPORT_C_INCLUDE_DIRS, at
> some point in the future.

FYI, it already is and has been since M. So it depends whether you
care about L support. IMO, with O coming out soon, it's time to drop
L. 3 years/versions of Android support in master seems like plenty to
me.

Rob
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 1/2] android: link libmesa_intel_common with zlib and expat

2017-07-31 Thread Emil Velikov 
On 31 July 2017 at 09:32, Tapani Pälli  wrote:
> Makes it possible to build Mesa on Android with -DDEBUG with
> the next patch that reverts 4f695731.
>
> Signed-off-by: Tapani Pälli 
> ---
>  src/intel/Android.common.mk | 5 +
>  1 file changed, 5 insertions(+)
>
> diff --git a/src/intel/Android.common.mk b/src/intel/Android.common.mk
> index f056f0a..12cea6e 100644
> --- a/src/intel/Android.common.mk
> +++ b/src/intel/Android.common.mk
> @@ -32,10 +32,15 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
>  LOCAL_SRC_FILES := $(COMMON_FILES)
>
>  LOCAL_C_INCLUDES := \
> +   external/zlib \
Ideally this will be part of zlib's LOCAL_EXPORT_C_INCLUDE_DIRS, at
some point in the future.

Regardless, patch looks good:
Reviewed-by: Emil Velikov 

-Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 1/2] android: link libmesa_intel_common with zlib and expat

2017-07-31 Thread Tapani Pälli 
Makes it possible to build Mesa on Android with -DDEBUG with
the next patch that reverts 4f695731.

Signed-off-by: Tapani Pälli 
---
 src/intel/Android.common.mk | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/intel/Android.common.mk b/src/intel/Android.common.mk
index f056f0a..12cea6e 100644
--- a/src/intel/Android.common.mk
+++ b/src/intel/Android.common.mk
@@ -32,10 +32,15 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_SRC_FILES := $(COMMON_FILES)
 
 LOCAL_C_INCLUDES := \
+   external/zlib \
$(MESA_TOP)/src/gallium/include \
$(MESA_TOP)/src/gallium/auxiliary \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa
 
+LOCAL_SHARED_LIBRARIES := libexpat libz
+
+LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
-- 
2.9.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev