Skip to content

Commit 8d7f217

Browse files
author
tiann
committed
Use c++_static instead of gunstl (NDK 18 doesn't support it now)
1 parent 0f325df commit 8d7f217

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
APP_ABI := armeabi-v7a x86
22
APP_PLATFORM := android-14
3-
APP_STL := gnustl_static
3+
APP_STL := c++_static
44
APP_OPTIM := release
55
VA_ROOT := $(call my-dir)
66
NDK_MODULE_PATH := $(NDK_MODULE_PATH):$(VA_ROOT)

VirtualApp/lib/src/main/jni/Jni/VAJni.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <fb/include/fb/Build.h>
66
#include <fb/include/fb/ALog.h>
77
#include <fb/include/fb/fbjni.h>
8+
#include <ctime>
89
#include "VAJni.h"
910

1011
using namespace facebook::jni;

VirtualApp/lib/src/main/jni/Substrate/SubstrateHook.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ printf("SubstrateHookFunctionThumb\n");
460460
} exts = {backup[offset+1]};
461461

462462
buffer[start+0] = T1$ldr_rt_$rn_im$(exts.rt, A$pc, T$Label(start+0, end-2));
463-
buffer[start+1] = T2$ldr_rt_$rn_im$(exts.rt, A$pc, T$Label(start+0, end-2));
463+
buffer[start+1] = T2$ldr_rt_$rn_im$(exts.rt, A$pc, (int)T$Label(start+0, end-2));
464464

465465
buffer[start+2] = T1$ldr_rt_$rn_im$(exts.rt, exts.rt, 0);
466466
buffer[start+3] = T2$ldr_rt_$rn_im$(exts.rt, exts.rt, 0);
@@ -644,7 +644,7 @@ printf("SubstrateHookFunctionARM\n");
644644
if (guard)
645645
buffer[start++] = A$stmdb_sp$_$rs$((1 << copy.rn));
646646

647-
buffer[start+0] = A$ldr_rd_$rn_im$(copy.rn, A$pc, (end-1 - (start+0)) * 4 - 8);
647+
buffer[start+0] = A$ldr_rd_$rn_im$(copy.rn, A$pc, (int)(end-1 - (start+0)) * 4 - 8);
648648
buffer[start+1] = copy.value;
649649

650650
start += 2;

0 commit comments

Comments
 (0)