mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-11 05:26:24 +02:00
Pass Build.BOARD from Java, avoid lookup.
Fixes arm64 build with r10, but is ugly coupling.
This commit is contained in:
1 parent
fd0af5b271
commit
02db45982a
4 files changed
+11
-30
No files matched your search
@@ -23,9 +23,6 @@
|
||||
#ifdef BLACKBERRY
|
||||
#include <bps/deviceinfo.h>
|
||||
#endif
|
||||
#ifdef ANDROID
|
||||
#include <sys/system_properties.h>
|
||||
#endif
|
||||
|
||||
// Only Linux platforms have /proc/cpuinfo
|
||||
#if defined(__linux__)
|
||||
@@ -46,17 +43,6 @@ std::string GetCPUString() {
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef ANDROID
|
||||
if (cpu_string.empty()) {
|
||||
char temp[PROP_VALUE_MAX];
|
||||
if (__system_property_get("ro.product.board", temp) != 0) {
|
||||
cpu_string = temp;
|
||||
} else if (__system_property_get("ro.product.name", temp) != 0) {
|
||||
cpu_string = temp;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (cpu_string.empty())
|
||||
cpu_string = "Unknown";
|
||||
else if (cpu_string.back() == '\n')
|
||||
@@ -81,17 +67,6 @@ std::string GetCPUBrandString() {
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef ANDROID
|
||||
if (brand_string.empty()) {
|
||||
char temp[PROP_VALUE_MAX];
|
||||
if (__system_property_get("ro.product.model", temp) != 0) {
|
||||
brand_string = temp;
|
||||
} else if (__system_property_get("ro.product.name", temp) != 0) {
|
||||
brand_string = temp;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (brand_string.empty())
|
||||
brand_string = "Unknown";
|
||||
else if (brand_string.back() == '\n')
|
||||
@@ -296,8 +271,6 @@ void CPUInfo::Detect()
|
||||
// Whether the above detection failed or not, on ARM64 we do have ASIMD/NEON.
|
||||
bNEON = true;
|
||||
bASIMD = true;
|
||||
|
||||
sBugs.bExynos8890Invalidation = strcmp(cpu_string, "universal8890") == 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user