Support x86_64

Author: collam

app/build.gradle

@@ -15,7 +15,7 @@ android {
         versionCode 5
         versionName "1.0.4"
         ndk {
-            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86'
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

trustdevice/build.gradle

@@ -31,7 +31,7 @@ android {
 
         externalNativeBuild{
             cmake {
-                abiFilters 'arm64-v8a','armeabi-v7a','x86'
+                abiFilters 'arm64-v8a','armeabi-v7a','x86', 'x86_64'
             }
         }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

trustdevice/src/main/cpp/utils.cpp

@@ -21,7 +21,7 @@ jstring get_property(JNIEnv *env, jobject __unused, jstring _key, jstring _defau
 bool mem_read_access_by_maps(void *read_addr, size_t len) {
     if(read_addr == nullptr)
         return false;
-#if defined(__aarch64__)
+#if defined(__LP64__)
     uint64_t addr = (uint64_t)read_addr;
     uint64_t start_addr = 0, end_addr = 0, last_addr = 0;
 #else
@@ -37,7 +37,7 @@ bool mem_read_access_by_maps(void *read_addr, size_t len) {
     }
 
     while(fgets(buff, sizeof(buff)-1, fmap) != nullptr) {
-#if defined(__aarch64__)
+#if defined(__LP64__)
         sscanf(buff, "%lx-%lx %c", &start_addr, &end_addr, &access);
 #else
         sscanf(buff, "%x-%x %c", &start_addr, &end_addr, &access);