diff --git a/tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id b/tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id new file mode 100644 index 0000000000..ebbb0dbcfb --- /dev/null +++ b/tests/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id @@ -0,0 +1 @@ +ecab9afc457e142e9fcb5d7ff4dfd6ef3152e865 \ No newline at end of file diff --git a/tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id b/tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id new file mode 100644 index 0000000000..8c018ddeb7 --- /dev/null +++ b/tests/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id @@ -0,0 +1 @@ +f8b2ca57289d0938dcf7a295f7f404fb2ee71b56 \ No newline at end of file diff --git a/tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id b/tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id new file mode 100644 index 0000000000..ece9b96acc --- /dev/null +++ b/tests/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id @@ -0,0 +1 @@ +f65579564b3c7dde5cf1509b7282dcf0f919de87 \ No newline at end of file diff --git a/tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id b/tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id new file mode 100644 index 0000000000..1b8d039388 --- /dev/null +++ b/tests/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id @@ -0,0 +1 @@ +418e418cfd4ff613c1af658a02c7cd40b650f05f \ No newline at end of file diff --git a/tests/proj.android/build_native.sh b/tests/proj.android/build_native.sh index f2d6a51203..a54feada07 100755 --- a/tests/proj.android/build_native.sh +++ b/tests/proj.android/build_native.sh @@ -63,6 +63,10 @@ done # remove test_image_rgba4444.pvr.gz rm -f $TESTS_ROOT/assets/Images/test_image_rgba4444.pvr.gz +rm -f $TESTS_ROOT/assets/Images/test_1021x1024_rgba8888.pvr.gz +rm -f $TESTS_ROOT/assets/Images/test_1021x1024_rgb888.pvr.gz +rm -f $TESTS_ROOT/assets/Images/test_1021x1024_rgba4444.pvr.gz +rm -f $TESTS_ROOT/assets/Images/test_1021x1024_a8.pvr.gz # build if [[ $buildexternalsfromsource ]]; then diff --git a/tests/tests/Texture2dTest/Texture2dTest.cpp b/tests/tests/Texture2dTest/Texture2dTest.cpp index 05aabb1b9b..e50762c8bd 100644 --- a/tests/tests/Texture2dTest/Texture2dTest.cpp +++ b/tests/tests/Texture2dTest/Texture2dTest.cpp @@ -1524,6 +1524,21 @@ void TextureMemoryAlloc::updateImage(cocos2d::CCObject *sender) case 0: file = "Images/test_1021x1024.png"; break; +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + // android can not pack .gz file into apk file + case 1: + file = "Images/test_1021x1024_rgba8888.pvr"; + break; + case 2: + file = "Images/test_1021x1024_rgb888.pvr"; + break; + case 3: + file = "Images/test_1021x1024_rgba4444.pvr"; + break; + case 4: + file = "Images/test_1021x1024_a8.pvr"; + break; +#else case 1: file = "Images/test_1021x1024_rgba8888.pvr.gz"; break; @@ -1536,6 +1551,7 @@ void TextureMemoryAlloc::updateImage(cocos2d::CCObject *sender) case 4: file = "Images/test_1021x1024_a8.pvr.gz"; break; +#endif } m_pBackground = CCSprite::create(file.c_str());