diff options
| author | Douglas Leung <douglas.leung@imgtec.com> | 2015-05-19 17:30:08 -0700 |
|---|---|---|
| committer | Douglas Leung <douglas.leung@imgtec.com> | 2016-02-08 14:02:47 -0800 |
| commit | d10e01775b0364422ae0c67c89fc3afd5da337e8 (patch) | |
| tree | 30d8464be808ada66f79644da4a87f690100a4c4 /libnativebridge | |
| parent | aae1eb2c4f10f3d2c49455eb37c4ae4b38ffa47d (diff) | |
| download | system_core-d10e01775b0364422ae0c67c89fc3afd5da337e8.tar.gz system_core-d10e01775b0364422ae0c67c89fc3afd5da337e8.tar.bz2 system_core-d10e01775b0364422ae0c67c89fc3afd5da337e8.zip | |
Add Mips64 Runtime ISA type.
Change-Id: I8d8d1ab10787899e91abafe269b59ee535e85653
Diffstat (limited to 'libnativebridge')
| -rw-r--r-- | libnativebridge/native_bridge.cc | 4 | ||||
| -rw-r--r-- | libnativebridge/tests/NeedsNativeBridge_test.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libnativebridge/native_bridge.cc b/libnativebridge/native_bridge.cc index 32a65ea04..ecfd719bc 100644 --- a/libnativebridge/native_bridge.cc +++ b/libnativebridge/native_bridge.cc @@ -231,8 +231,10 @@ bool LoadNativeBridge(const char* nb_library_filename, static const char* kRuntimeISA = "arm"; #elif defined(__aarch64__) static const char* kRuntimeISA = "arm64"; -#elif defined(__mips__) +#elif defined(__mips__) && !defined(__LP64__) static const char* kRuntimeISA = "mips"; +#elif defined(__mips__) && defined(__LP64__) +static const char* kRuntimeISA = "mips64"; #elif defined(__i386__) static const char* kRuntimeISA = "x86"; #elif defined(__x86_64__) diff --git a/libnativebridge/tests/NeedsNativeBridge_test.cpp b/libnativebridge/tests/NeedsNativeBridge_test.cpp index e1c087694..2067ed205 100644 --- a/libnativebridge/tests/NeedsNativeBridge_test.cpp +++ b/libnativebridge/tests/NeedsNativeBridge_test.cpp @@ -18,15 +18,17 @@ namespace android { -static const char* kISAs[] = { "arm", "arm64", "mips", "x86", "x86_64", "random", "64arm", "64_x86", - "64_x86_64", "", "reallylongstringabcd", nullptr }; +static const char* kISAs[] = { "arm", "arm64", "mips", "mips64", "x86", "x86_64", "random", "64arm", + "64_x86", "64_x86_64", "", "reallylongstringabcd", nullptr }; #if defined(__arm__) static const char* kRuntimeISA = "arm"; #elif defined(__aarch64__) static const char* kRuntimeISA = "arm64"; -#elif defined(__mips__) +#elif defined(__mips__) && !defined(__LP64__) static const char* kRuntimeISA = "mips"; +#elif defined(__mips__) && defined(__LP64__) +static const char* kRuntimeISA = "mips64"; #elif defined(__i386__) static const char* kRuntimeISA = "x86"; #elif defined(__x86_64__) |