android: util: Add libcutils to Android.mk shared libs

Otherwise:

    external/mesa3d/src/util/os_misc.c:59:12: fatal error: 'cutils/properties.h' file not found
    #  include <cutils/properties.h>
               ^~~~~~~~~~~~~~~~~~~~~

And:

    ld.lld: error: undefined symbol: property_get
    >>> referenced by os_misc.c:193 (external/mesa3d/src/util/os_misc.c:193)
    >>>               os_misc.o:(os_get_option) in archive out/target/product/discovery/obj/STATIC_LIBRARIES/libmesa_util_intermediates/libmesa_util.a

Fixes: eeecc21d93 ("util: Add property_get() fallback for android")
Acked-by: Rob Clark <robclark@freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7861>
This commit is contained in:
Marijn Suijten
2020-12-01 19:13:14 +01:00
parent e2b4247e40
commit 77dafaece3
2 changed files with 3 additions and 1 deletions
+2
View File
@@ -91,6 +91,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_util \
libmesa_loader
LOCAL_SHARED_LIBRARIES += libcutils
# sort GALLIUM_SHARED_LIBS to remove any duplicates
LOCAL_SHARED_LIBRARIES += $(sort $(GALLIUM_SHARED_LIBS))
+1 -1
View File
@@ -58,7 +58,7 @@ LOCAL_SHARED_LIBRARIES := \
libexpat
endif
LOCAL_SHARED_LIBRARIES += liblog libsync
LOCAL_SHARED_LIBRARIES += liblog libsync libcutils
# Generated sources