diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2019-05-08 20:33:00 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2019-05-10 11:19:50 +0530 |
| commit | f1dbbfbe527ae9097bb9fc6036f0a8a01e43549d (patch) | |
| tree | 2282f79951900436456f572d1d004c0c4b6d4ea4 | |
| parent | f5898aa62a3e836b01e1ed06b119005b7f404036 (diff) | |
mesa: android: disable vc4 usage of libexpatexpat_wip
vc4 uses libexpat in a decoder component, while from O+
Android doesn't expect libexpat to be linked into any code.
This patch disables vc4 usage of the xml portions, to allow
building aosp/master.
Change-Id: I9a322ecc14851d0fa6790ef7ab048517e9460864
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
| -rw-r--r-- | src/broadcom/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/Android.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/broadcom/Android.mk b/src/broadcom/Android.mk index b3bf4051041..28b4c023e01 100644 --- a/src/broadcom/Android.mk +++ b/src/broadcom/Android.mk @@ -25,5 +25,5 @@ LOCAL_PATH := $(call my-dir) # Import variables include $(LOCAL_PATH)/Makefile.sources -include $(LOCAL_PATH)/Android.genxml.mk -include $(LOCAL_PATH)/Android.cle.mk +#include $(LOCAL_PATH)/Android.genxml.mk +#include $(LOCAL_PATH)/Android.cle.mk diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk index 45c95b649a2..f049bcb1059 100644 --- a/src/gallium/drivers/vc4/Android.mk +++ b/src/gallium/drivers/vc4/Android.mk @@ -40,9 +40,9 @@ LOCAL_C_INCLUDES := \ LOCAL_STATIC_LIBRARIES := \ libmesa_nir -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libmesa_broadcom_cle \ - libmesa_broadcom_genxml +#LOCAL_WHOLE_STATIC_LIBRARIES := \ +# libmesa_broadcom_cle \ +# libmesa_broadcom_genxml LOCAL_MODULE := libmesa_pipe_vc4 |