summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-08-04 18:59:58 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-13 00:46:57 +0100
commit73121a34d455d1a79c10e859e0d47849614b1d00 (patch)
treed27eee1c2a04d801751f923450d12a91e696c884
parentdb4d7229bc4687714ee5384667eeda4224c13631 (diff)
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>
-rw-r--r--src/egl/drivers/dri2/Android.mk2
-rw-r--r--src/egl/main/Android.mk2
-rw-r--r--src/loader/Android.mk4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk
index 679cc2e5cc..f91a90336b 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 c3d9197565..8c37e798f0 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 1c6fdaeccc..8daeedf5da 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)