[Mesa-dev] [PATCH 4/5] Android: drop Android 4.4 (KitKat) support

[Rob Herring]

On Mon, Mar 20, 2017 at 11:03 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> On 20 March 2017 at 01:33, Rob Herring <robh at kernel.org> wrote:
>> Any users of KitKat are likely using an older version of Mesa and
>> KitKat support adds complexity to the make files. Dropping support
>> allows removing the MESA_LOLLIPOP_BUILD make variable in various make
>> files.
>>
>
> Please mention why we're safe to drop the external/libcxx/include
> include. If you can say when libcxx (?) was fixed that'll be a bonus.
>
>> Signed-off-by: Rob Herring <robh at kernel.org>
>> ---
>>  Android.common.mk                      | 19 +++++++------------
>>  Android.mk                             |  8 --------
>>  src/egl/Android.mk                     |  4 ----
>>  src/gallium/drivers/nouveau/Android.mk |  5 -----
>>  src/gallium/drivers/r600/Android.mk    |  5 -----
>>  src/gallium/targets/dri/Android.mk     | 11 ++---------
>>  src/mesa/drivers/dri/i915/Android.mk   |  6 ------
>>  src/mesa/drivers/dri/i965/Android.mk   |  6 ------
>>  8 files changed, 9 insertions(+), 55 deletions(-)
>>
>> diff --git a/Android.common.mk b/Android.common.mk
>> index 7431b1d3dc5b..6b64c38d4d30 100644
>> --- a/Android.common.mk
>> +++ b/Android.common.mk
>> @@ -66,7 +66,10 @@ LOCAL_CFLAGS += \
>>  LOCAL_CPPFLAGS += \
>>         -D__STDC_CONSTANT_MACROS \
>>         -D__STDC_FORMAT_MACROS \
>> -       -D__STDC_LIMIT_MACROS
>> +       -D__STDC_LIMIT_MACROS \
>> +       -D_USING_LIBCXX \
> I second Chih-Wei here - we don't need this define. It is a left over
> from the early/incomplete version of the nouveau fixes.
>
>> +       -Wno-error=non-virtual-dtor \
>> +       -Wno-non-virtual-dtor \
>>
> Please drop the trailing \
>
>
>> +LOCAL_MODULE_REL_PATH ?= $(MESA_DRI_MODULE_REL_PATH)
> This one is meant to be "RELATIVE" as opposed to "REL" correct ?
> Personally I'd keep that in the separate makefiles, but I won't object
> (to much ;-) if you prefer it here.
>
>> @@ -118,7 +111,7 @@ LOCAL_STATIC_LIBRARIES += \
>>         libLLVMR600Info \
>>         libLLVMR600AsmPrinter \
>>         libelf
>> -LOCAL_LDLIBS += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-lgcc)
>> +LOCAL_LDLIBS += -lgcc
> Would be great if we can a comment why we need this. But that's
> unrelated to this patch of course.

At least with master, it just breaks the build further:

ninja: error: 'out/target/product/linaro_x86_64/obj_x86/SHARED_LIBRARIES/libgcc_intermediates/export_includes',
needed by 'out/target/product/linaro_x86_64/obj_x86/SHARED_LIBRARIES/gallium_dri_intermediates/import_includes',
missing and no known rule to make it
14:46:39 ninja failed with: exit status 1

If anything, this should probably be with the rest of the LLVM setup.
IMO, all the LLVM stuff should be ripped out if it doesn't work with
AOSP master/releases. If carrying LLVM patches is okay, then so should
be carrying Mesa patches for LLVM.

Rob