diff options
| author | Alessandro Astone <ales.astone@gmail.com> | 2022-06-18 16:20:37 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-06-26 22:06:36 +0000 |
| commit | 46d4a0f8b299d96c6161ed2eeeafa0bf47969a33 (patch) | |
| tree | d7732035179d41a3c076f79d5cd68e4ee2414962 /android | |
| parent | b28efd80ebb4d8602dbaba29714e77906ea36be3 (diff) | |
| download | mesa-46d4a0f8b299d96c6161ed2eeeafa0bf47969a33.tar.gz | |
Android.mk: Cleanup mesa3d-lib
Properly cleanup variables before declaring a library.
Explicitly require library dependencies.
Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16674>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Android.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/android/Android.mk b/android/Android.mk index 430b01a26b6..4acc6577468 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -98,6 +98,8 @@ LOCAL_SHARED_LIBRARIES += \ MESON_GEN_PKGCONFIGS += android.hardware.graphics.mapper:4.0 endif +__MY_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) + ifeq ($(TARGET_IS_64_BIT),true) LOCAL_MULTILIB := 64 else @@ -112,7 +114,13 @@ endif #------------------------------------------------------------------------------- +# $1: name +# $2: symlink suffix +# $3: subdir +# $4: source prebuilt +# $5: export headers define mesa3d-lib +include $(CLEAR_VARS) LOCAL_MODULE_CLASS := SHARED_LIBRARIES LOCAL_MODULE := $1 LOCAL_VENDOR_MODULE := true @@ -127,14 +135,11 @@ endif LOCAL_CHECK_ELF_FILES := false LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_SYMLINKS := $1$2 +LOCAL_SHARED_LIBRARIES := $(__MY_SHARED_LIBRARIES) +LOCAL_EXPORT_C_INCLUDE_DIRS := $5 include $(BUILD_PREBUILT) -include $(CLEAR_VARS) endef -__MY_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) -include $(CLEAR_VARS) -LOCAL_SHARED_LIBRARIES := $(__MY_SHARED_LIBRARIES) - # Module 'libgallium_dri', produces '/vendor/lib{64}/dri/libgallium_dri.so' # This module also trigger DRI symlinks creation process $(eval $(call mesa3d-lib,libgallium_dri,.so.0,dri,MESA3D_GALLIUM_DRI_BIN)) @@ -153,10 +158,8 @@ $(foreach driver,$(BOARD_MESA3D_VULKAN_DRIVERS), \ $(eval $(call mesa3d-lib,vulkan.$(MESA_VK_LIB_SUFFIX_$(driver)),.so.0,hw,MESA3D_VULKAN_$(driver)_BIN))) ifneq ($(filter true, $(BOARD_MESA3D_BUILD_LIBGBM)),) -LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA3D_TOP)/src/gbm/main - # Modules 'libgbm', produces '/vendor/lib{64}/libgbm.so' -$(eval $(call mesa3d-lib,libgbm,.so.1,,MESA3D_LIBGBM_BIN)) +$(eval $(call mesa3d-lib,libgbm,.so.1,,MESA3D_LIBGBM_BIN,$(MESA3D_TOP)/src/gbm/main)) endif #------------------------------------------------------------------------------- |