diff options
| -rw-r--r-- | CMakeLists.txt | 20 | ||||
| -rw-r--r-- | jni/Android.mk | 28 | ||||
| -rwxr-xr-x | scripts/android-arm64-mock.sh | 4 | ||||
| -rw-r--r-- | test/mock/galaxy-j7-tmobile.cc | 2 | ||||
| -rw-r--r-- | test/mock/galaxy-j7-uae.cc | 2 |
5 files changed, 24 insertions, 32 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 05cd0b1..ec90077 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,6 +194,16 @@ IF(CPUINFO_BUILD_MOCK_TESTS) TARGET_LINK_LIBRARIES(galaxy-grand-prime-value-edition-test PRIVATE cpuinfo_mock gtest) ADD_TEST(galaxy-grand-prime-value-edition-test galaxy-grand-prime-value-edition-test) + ADD_EXECUTABLE(galaxy-j7-tmobile-test test/mock/galaxy-j7-tmobile.cc) + TARGET_INCLUDE_DIRECTORIES(galaxy-j7-tmobile-test PRIVATE test/mock) + TARGET_LINK_LIBRARIES(galaxy-j7-tmobile-test PRIVATE cpuinfo_mock gtest) + ADD_TEST(galaxy-j7-tmobile-test galaxy-j7-tmobile-test) + + ADD_EXECUTABLE(galaxy-j7-uae-test test/mock/galaxy-j7-uae.cc) + TARGET_INCLUDE_DIRECTORIES(galaxy-j7-uae-test PRIVATE test/mock) + TARGET_LINK_LIBRARIES(galaxy-j7-uae-test PRIVATE cpuinfo_mock gtest) + ADD_TEST(galaxy-j7-uae-test galaxy-j7-uae-test) + ADD_EXECUTABLE(galaxy-s3-us-test test/mock/galaxy-s3-us.cc) TARGET_INCLUDE_DIRECTORIES(galaxy-s3-us-test PRIVATE test/mock) TARGET_LINK_LIBRARIES(galaxy-s3-us-test PRIVATE cpuinfo_mock gtest) @@ -296,16 +306,6 @@ IF(CPUINFO_BUILD_MOCK_TESTS) TARGET_LINK_LIBRARIES(galaxy-c9-pro-test PRIVATE cpuinfo_mock gtest) ADD_TEST(galaxy-c9-pro-test galaxy-c9-pro-test) - ADD_EXECUTABLE(galaxy-j7-tmobile-test test/mock/galaxy-j7-tmobile.cc) - TARGET_INCLUDE_DIRECTORIES(galaxy-j7-tmobile-test PRIVATE test/mock) - TARGET_LINK_LIBRARIES(galaxy-j7-tmobile-test PRIVATE cpuinfo_mock gtest) - ADD_TEST(galaxy-j7-tmobile-test galaxy-j7-tmobile-test) - - ADD_EXECUTABLE(galaxy-j7-uae-test test/mock/galaxy-j7-uae.cc) - TARGET_INCLUDE_DIRECTORIES(galaxy-j7-uae-test PRIVATE test/mock) - TARGET_LINK_LIBRARIES(galaxy-j7-uae-test PRIVATE cpuinfo_mock gtest) - ADD_TEST(galaxy-j7-uae-test galaxy-j7-uae-test) - ADD_EXECUTABLE(galaxy-s6-test test/mock/galaxy-s6.cc) TARGET_INCLUDE_DIRECTORIES(galaxy-s6-test PRIVATE test/mock) TARGET_LINK_LIBRARIES(galaxy-s6-test PRIVATE cpuinfo_mock gtest) diff --git a/jni/Android.mk b/jni/Android.mk index b34dd06..052cdd1 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -226,6 +226,20 @@ LOCAL_STATIC_LIBRARIES := cpuinfo_mock gtest include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) +LOCAL_MODULE := galaxy-j7-tmobile-test +LOCAL_SRC_FILES := $(LOCAL_PATH)/test/mock/galaxy-j7-tmobile.cc +LOCAL_C_INCLUDES := $(LOCAL_PATH)/test/mock +LOCAL_STATIC_LIBRARIES := cpuinfo_mock gtest +include $(BUILD_EXECUTABLE) + +include $(CLEAR_VARS) +LOCAL_MODULE := galaxy-j7-uae-test +LOCAL_SRC_FILES := $(LOCAL_PATH)/test/mock/galaxy-j7-uae.cc +LOCAL_C_INCLUDES := $(LOCAL_PATH)/test/mock +LOCAL_STATIC_LIBRARIES := cpuinfo_mock gtest +include $(BUILD_EXECUTABLE) + +include $(CLEAR_VARS) LOCAL_MODULE := galaxy-s3-us-test LOCAL_SRC_FILES := $(LOCAL_PATH)/test/mock/galaxy-s3-us.cc LOCAL_C_INCLUDES := $(LOCAL_PATH)/test/mock @@ -399,20 +413,6 @@ LOCAL_STATIC_LIBRARIES := cpuinfo_mock gtest include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) -LOCAL_MODULE := galaxy-j7-tmobile-test -LOCAL_SRC_FILES := $(LOCAL_PATH)/test/mock/galaxy-j7-tmobile.cc -LOCAL_C_INCLUDES := $(LOCAL_PATH)/test/mock -LOCAL_STATIC_LIBRARIES := cpuinfo_mock gtest -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_MODULE := galaxy-j7-uae-test -LOCAL_SRC_FILES := $(LOCAL_PATH)/test/mock/galaxy-j7-uae.cc -LOCAL_C_INCLUDES := $(LOCAL_PATH)/test/mock -LOCAL_STATIC_LIBRARIES := cpuinfo_mock gtest -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) LOCAL_MODULE := galaxy-s6-test LOCAL_SRC_FILES := $(LOCAL_PATH)/test/mock/galaxy-s6.cc LOCAL_C_INCLUDES := $(LOCAL_PATH)/test/mock diff --git a/scripts/android-arm64-mock.sh b/scripts/android-arm64-mock.sh index 1b68cf3..dc75195 100755 --- a/scripts/android-arm64-mock.sh +++ b/scripts/android-arm64-mock.sh @@ -3,8 +3,6 @@ set -e adb push libs/arm64-v8a/galaxy-c9-pro-test /data/local/tmp/galaxy-c9-pro-test -adb push libs/arm64-v8a/galaxy-j7-tmobile-test /data/local/tmp/galaxy-j7-tmobile-test -adb push libs/arm64-v8a/galaxy-j7-uae-test /data/local/tmp/galaxy-j7-uae-test adb push libs/arm64-v8a/galaxy-s6-test /data/local/tmp/galaxy-s6-test adb push libs/arm64-v8a/galaxy-s7-global-test /data/local/tmp/galaxy-s7-global-test adb push libs/arm64-v8a/galaxy-s7-us-test /data/local/tmp/galaxy-s7-us-test @@ -30,8 +28,6 @@ adb push libs/arm64-v8a/xiaomi-redmi-note-3-test /data/local/tmp/xiaomi-redmi-no adb push libs/arm64-v8a/xperia-c4-dual-test /data/local/tmp/xperia-c4-dual-test adb shell "/data/local/tmp/galaxy-c9-pro-test --gtest_color=yes" -adb shell "/data/local/tmp/galaxy-j7-tmobile-test --gtest_color=yes" -adb shell "/data/local/tmp/galaxy-j7-uae-test --gtest_color=yes" adb shell "/data/local/tmp/galaxy-s6-test --gtest_color=yes" adb shell "/data/local/tmp/galaxy-s7-global-test --gtest_color=yes" adb shell "/data/local/tmp/galaxy-s7-us-test --gtest_color=yes" diff --git a/test/mock/galaxy-j7-tmobile.cc b/test/mock/galaxy-j7-tmobile.cc index 9ac886d..8c92188 100644 --- a/test/mock/galaxy-j7-tmobile.cc +++ b/test/mock/galaxy-j7-tmobile.cc @@ -506,8 +506,6 @@ int main(int argc, char* argv[]) { #if CPUINFO_ARCH_ARM cpuinfo_set_hwcap(UINT32_C(0x0007B0D6)); cpuinfo_set_hwcap2(UINT32_C(0x0000001F)); -#elif CPUINFO_ARCH_ARM64 - cpuinfo_set_hwcap(UINT32_C(0x000000FF)); #endif cpuinfo_mock_filesystem(filesystem); #ifdef __ANDROID__ diff --git a/test/mock/galaxy-j7-uae.cc b/test/mock/galaxy-j7-uae.cc index 13fc1ce..bcca9e9 100644 --- a/test/mock/galaxy-j7-uae.cc +++ b/test/mock/galaxy-j7-uae.cc @@ -506,8 +506,6 @@ int main(int argc, char* argv[]) { #if CPUINFO_ARCH_ARM cpuinfo_set_hwcap(UINT32_C(0x0007B0D6)); cpuinfo_set_hwcap2(UINT32_C(0x0000001F)); -#elif CPUINFO_ARCH_ARM64 - cpuinfo_set_hwcap(UINT32_C(0x000000FF)); #endif cpuinfo_mock_filesystem(filesystem); #ifdef __ANDROID__ |