Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dae91f75 authored by Douglas Leung's avatar Douglas Leung Committed by android-build-merger
Browse files

Merge "Add Mips64 Runtime ISA type." 

am: 44095c6d

* commit '44095c6d':
  Add Mips64 Runtime ISA type.
parents 89e2d4dc 44095c6d

libnativebridge/native_bridge.cc

+3 −1
Original line number Diff line number Diff line
@@ -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__)

libnativebridge/tests/NeedsNativeBridge_test.cpp

+5 −3
Original line number Diff line number Diff line
@@ -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__)