From 1bda276392c18f5a8133f1f51a42e265bf33be57 Mon Sep 17 00:00:00 2001 From: samuele3hu Date: Fri, 22 Aug 2014 13:49:54 +0800 Subject: [PATCH] Update android.mk for related cpp test cases --- .../proj.android/jni/Android.mk | 8 ++++--- tests/cpp-tests/Android.mk | 21 ++++--------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/tests/cpp-empty-test/proj.android/jni/Android.mk b/tests/cpp-empty-test/proj.android/jni/Android.mk index 66788e1c7f..b351c80aa6 100644 --- a/tests/cpp-empty-test/proj.android/jni/Android.mk +++ b/tests/cpp-empty-test/proj.android/jni/Android.mk @@ -10,11 +10,13 @@ LOCAL_SRC_FILES := main.cpp \ ../../Classes/AppDelegate.cpp \ ../../Classes/HelloWorldScene.cpp -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \ + $(LOCAL_PATH)/../../../../extensions \ + $(LOCAL_PATH)/../../../.. \ + $(LOCAL_PATH)/../../../../cocos/editor-support -LOCAL_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static +LOCAL_STATIC_LIBRARIES := cocos2dx_static include $(BUILD_SHARED_LIBRARY) $(call import-module,.) -$(call import-module,audio/android) diff --git a/tests/cpp-tests/Android.mk b/tests/cpp-tests/Android.mk index 3fd81f2445..a954ff93e1 100644 --- a/tests/cpp-tests/Android.mk +++ b/tests/cpp-tests/Android.mk @@ -186,26 +186,13 @@ Classes/UITest/UITest.cpp \ Classes/UserDefaultTest/UserDefaultTest.cpp \ Classes/ZwoptexTest/ZwoptexTest.cpp -LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes +LOCAL_C_INCLUDES := $(LOCAL_PATH)/Classes \ + $(LOCAL_PATH)/../.. -LOCAL_STATIC_LIBRARIES := cocosbuilder_static -LOCAL_STATIC_LIBRARIES += cocosdenshion_static -LOCAL_STATIC_LIBRARIES += spine_static -LOCAL_STATIC_LIBRARIES += cocostudio_static -LOCAL_STATIC_LIBRARIES += cocos_network_static -LOCAL_STATIC_LIBRARIES += cocos_extension_static -LOCAL_STATIC_LIBRARIES += box2d_static -LOCAL_STATIC_LIBRARIES += cocos3d_static +LOCAL_STATIC_LIBRARIES := cocos2dx_static LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/Classes include $(BUILD_STATIC_LIBRARY) -$(call import-module,extensions) -$(call import-module,audio/android) -$(call import-module,editor-support/cocosbuilder) -$(call import-module,editor-support/spine) -$(call import-module,editor-support/cocostudio) -$(call import-module,network) -$(call import-module,Box2D) -$(call import-module,3d) +$(call import-module,cocos)