Skip to content

64bit app support #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiann merged 11 commits into from
Jul 11, 2020
Merged

64bit app support #880

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ab921b2
64bit makefile
tiann Jul 9, 2020
76b5cdb
Remove faccessat
tiann Jul 9, 2020
394aa67
Remove __openat
tiann Jul 9, 2020
f8b737f
Remove fchmodat
tiann Jul 9, 2020
9f1b3ac
Fix compile error
tiann Jul 9, 2020
a455358
ban 32bit app from selection list
tiann Jul 9, 2020
7c15001
import [And64InlineHook](https://github.com/Rprop/And64InlineHook)
tiann Jul 9, 2020
19ff7cf
Add missing syscall for 64bit
tiann Jul 9, 2020
d65b4df
pre-release: 0.19.0
tiann Jul 9, 2020
8014765
Fix compile error on x86_64
tiann Jul 10, 2020
f5b0cb2
A64InlineHook for arm64 and Substrate for x86_64
tiann Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ban 32bit app from selection list 
Signed-off-by: tiann <[email protected]>
  • Loading branch information
@tiann
tiann committed Jul 9, 2020
commit a455358c6cf22e16e6070d3e0a4696a8124f70e4
2 changes: 1 addition & 1 deletion VirtualApp/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ android {
android {
defaultConfig {
ndk {
abiFilters "armeabi-v7a", "x86"
abiFilters "arm64-v8a", "x86_64"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions VirtualApp/app/src/main/java/io/virtualapp/home/adapters/CloneAppListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ public void onBindViewHolder(ViewHolder holder, int position) {
holder.itemView.setOnClickListener(v -> {
mItemEventListener.onItemClick(info, position);
});
holder.itemView.setEnabled(info.is64bit);
}

@Override
Expand Down
1 change: 1 addition & 0 deletions VirtualApp/app/src/main/java/io/virtualapp/home/models/AppInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ public class AppInfo {
public CharSequence version;
public int cloneCount;
public boolean disableMultiVersion;
public boolean is64bit;
}
2 changes: 2 additions & 0 deletions VirtualApp/app/src/main/java/io/virtualapp/home/repo/AppRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.lody.virtual.GmsSupport;
import com.lody.virtual.client.core.InstallStrategy;
import com.lody.virtual.client.core.VirtualCore;
import com.lody.virtual.helper.compat.NativeLibraryHelperCompat;
import com.lody.virtual.helper.utils.DeviceUtil;
import com.lody.virtual.remote.InstallResult;
import com.lody.virtual.remote.InstalledAppInfo;
Expand Down Expand Up @@ -200,6 +201,7 @@ private List<AppInfo> convertPackageInfoToAppData(Context context, List<PackageI
info.disableMultiVersion = true;
info.cloneCount = 0;
}
info.is64bit = NativeLibraryHelperCompat.isApk64(ai.sourceDir);
list.add(info);
}
// sort by name
Expand Down
1 change: 0 additions & 1 deletion VirtualApp/lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ android {
versionName "1.0"
externalNativeBuild {
ndkBuild {
// abiFilters "armeabi-v7a", "x86"
abiFilters "arm64-v8a", "x86_64"
}
}
Expand Down
3 changes: 3 additions & 0 deletions VirtualApp/lib/src/main/java/com/lody/virtual/helper/compat/NativeLibraryHelperCompat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ private static Set<String> getABIsFromApk(String apk) {
return null;
}

public static boolean isApk64(String apk) {
return isVM64(getABIsFromApk(apk));
}
}