From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 4 Aug 2014 17:59:58 +0000 (+0100)
Subject: android: loader: prefix static libraries with libmesa_*
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73121a34d455d1a79c10e859e0d47849614b1d00;p=mesa.git

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 679cc2e5cca..f91a90336bf 100644
--- 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 c3d91975654..8c37e798f0a 100644
--- 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 1c6fdaeccc6..8daeedf5dad 100644
--- 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)