diff --git a/extensions/Android.mk b/extensions/Android.mk
index e5f7924e84..0a1877b23e 100644
--- a/extensions/Android.mk
+++ b/extensions/Android.mk
@@ -43,8 +43,8 @@ CocoStudio/Armature/display/CCDisplayFactory.cpp \
 CocoStudio/Armature/display/CCDisplayManager.cpp \
 CocoStudio/Armature/display/CCSkin.cpp \
 CocoStudio/Armature/physics/CCColliderDetector.cpp \
-CocoStudio/Armature/utils/CCArmatureDefine.cpp \
 CocoStudio/Armature/utils/CCArmatureDataManager.cpp \
+CocoStudio/Armature/utils/CCArmatureDefine.cpp \
 CocoStudio/Armature/utils/CCDataReaderHelper.cpp \
 CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.cpp \
 CocoStudio/Armature/utils/CCTransformHelp.cpp \
diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/Cpp/TestCpp/Android.mk
index 5bfb604d82..0bd66f56b9 100644
--- a/samples/Cpp/TestCpp/Android.mk
+++ b/samples/Cpp/TestCpp/Android.mk
@@ -45,6 +45,7 @@ Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \
 Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \
 Classes/EffectsTest/EffectsTest.cpp \
 Classes/ExtensionsTest/ExtensionsTest.cpp \
+Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp \
 Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp \
 Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \
 Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \
@@ -59,8 +60,27 @@ Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp \
 Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp \
 Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \
 Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \
-Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \
 Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextAreaTest/UITextAreaTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextButtonTest/UITextButtonTest.cpp \
+Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \
+Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \
 Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \
 Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp \
 Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp \