From 1d8f8853b7ea765ad4701e43972d8a432c9e3a34 Mon Sep 17 00:00:00 2001 From: folecr Date: Mon, 5 Mar 2012 12:26:11 -0800 Subject: [PATCH] Modify module names so that the prebuilt modules match those built from source. --- .../platform/third_party/android/prebuilt/libjpeg/Android.mk | 2 +- .../platform/third_party/android/prebuilt/libpng/Android.mk | 2 +- .../platform/third_party/android/prebuilt/libxml2/Android.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos2dx/platform/third_party/android/prebuilt/libjpeg/Android.mk b/cocos2dx/platform/third_party/android/prebuilt/libjpeg/Android.mk index 6650eeb07db5..b8786d07dfd0 100644 --- a/cocos2dx/platform/third_party/android/prebuilt/libjpeg/Android.mk +++ b/cocos2dx/platform/third_party/android/prebuilt/libjpeg/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := jpeg_static_prebuilt +LOCAL_MODULE := cocos_jpeg_static LOCAL_MODULE_FILENAME := jpeg LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libjpeg.a LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include diff --git a/cocos2dx/platform/third_party/android/prebuilt/libpng/Android.mk b/cocos2dx/platform/third_party/android/prebuilt/libpng/Android.mk index a45560e59bcb..b15dc34b9669 100644 --- a/cocos2dx/platform/third_party/android/prebuilt/libpng/Android.mk +++ b/cocos2dx/platform/third_party/android/prebuilt/libpng/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := png_static_prebuilt +LOCAL_MODULE := cocos_libpng_static LOCAL_MODULE_FILENAME := png LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libpng.a LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include diff --git a/cocos2dx/platform/third_party/android/prebuilt/libxml2/Android.mk b/cocos2dx/platform/third_party/android/prebuilt/libxml2/Android.mk index 060f9bd62966..f358c0dd83a9 100644 --- a/cocos2dx/platform/third_party/android/prebuilt/libxml2/Android.mk +++ b/cocos2dx/platform/third_party/android/prebuilt/libxml2/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := xml2_static_prebuilt +LOCAL_MODULE := cocos_libxml2_static LOCAL_MODULE_FILENAME := xml2 LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libxml2.a LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include