android: loader: prefix static libraries with libmesa_*

Will make it easier on us as CleanSpec.mk comes along and improves
consistency across the Android build.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk
index 679cc2e5cca56ea7d8eebdcd548300696ca8ada6..f91a90336bf14f92d5db3f383ad7cc26afc0f4db 100644 (file)
--- a/src/egl/drivers/dri2/Android.mk
+++ b/src/egl/drivers/dri2/Android.mk
@@ -44,7 +44,7 @@ LOCAL_C_INCLUDES := \
        $(DRM_GRALLOC_TOP)
 
 LOCAL_STATIC_LIBRARIES := \
-       libloader
+       libmesa_loader
 
 LOCAL_MODULE := libmesa_egl_dri2
 

diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk
index c3d9197565424e41ef3b23d224b1448b7fba85fa..8c37e798f0afcf55f368fdde43c87c9ec416e102 100644 (file)
--- a/src/egl/main/Android.mk
+++ b/src/egl/main/Android.mk
@@ -152,7 +152,7 @@ endif # MESA_BUILD_GALLIUM
 
 LOCAL_STATIC_LIBRARIES := \
        $(LOCAL_STATIC_LIBRARIES) \
-       libloader
+       libmesa_loader
 
 LOCAL_MODULE := libGLES_mesa
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl

diff --git a/src/loader/Android.mk b/src/loader/Android.mk
index 1c6fdaeccc66e89f957ab96a2f0a0779d0b70047..8daeedf5dad07fc4203667d9024d5f342e04ee8d 100644 (file)
--- a/src/loader/Android.mk
+++ b/src/loader/Android.mk
@@ -25,7 +25,7 @@ LOCAL_PATH := $(call my-dir)
 include $(LOCAL_PATH)/Makefile.sources
 
 # ---------------------------------------
-# Build libloader
+# Build libmesa_loader
 # ---------------------------------------
 
 include $(CLEAR_VARS)
@@ -40,7 +40,7 @@ else
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm
 endif
 
-LOCAL_MODULE := libloader
+LOCAL_MODULE := libmesa_loader
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)