mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-18 11:30:44 +01:00
Merge #17227: Qt: Add Android packaging support
246774e264depends: fix Qt precompiled headers bug (Igor Cota)8e7ad4146ddepends: disable Qt Vulkan support on Android (Igor Cota)ba46adaa1aCI: add Android APK build to cirrus (Igor Cota)7563720e30CI: add Android APK build script (Igor Cota)ebfb10cb75Qt: add Android packaging support (Igor Cota) Pull request description:  This PR is the third and final piece of the basic Android support puzzle - it depends on https://github.com/bitcoin/bitcoin/pull/16110 and is related to https://github.com/bitcoin/bitcoin/pull/16883. It introduces an `android` directory under `qt` and a simple way to build an Android package of `bitcoin-qt`: 1. Build depends for Android as described in the [README](https://github.com/bitcoin/bitcoin/blob/master/depends/README.md) 2. Configure with one of the resulting prefixes 3. Run `make && make apk` in `src/qt` The resulting APK files will be in `android/build/outputs/apk`. You can install them manually or with [adb](https://developer.android.com/studio/command-line/adb). One can also open the `android` directory in Android Studio for that integrated development and debugging experience. `BitcoinQtActivity` is your starting point. Under the hood makefile `apk` target: 1. Renames the `bitcoin-qt` binary to `libbitcoin-qt.so` and copies it over to a folder under `android/libs` depending on which prefix and corresponding [ABI](https://developer.android.com/ndk/guides/abis.html#sa) `bitcoin-qt` was built for 2. Takes `libc++_shared.so` from the Android NDK and puts in the same place. It [must be included](https://developer.android.com/ndk/guides/cpp-support) in the APK 3. Extracts Qt for Android Java support files from the `qtbase` archive in `depends/sources` to `android/src` There is also just a tiny bit of `ifdef`'d code to make the Qt Widgets menus usable. It's not pretty but it works and is a stepping stone towards https://github.com/bitcoin/bitcoin/pull/16883. ACKs for top commit: MarcoFalke: cr ACK246774e264laanwj: Code review ACK246774e264Tree-SHA512: ba30a746576a167545223c35a51ae60bb0838818779fc152c210f5af1413961b2a6ab6af520ff92cbc8dcd5dcb663e81ca960f021218430c1f76397ed4cead6c
This commit is contained in:
@@ -378,6 +378,20 @@ bitcoin_qt_clean: FORCE
|
||||
|
||||
bitcoin_qt : qt/bitcoin-qt$(EXEEXT)
|
||||
|
||||
APK_LIB_DIR = qt/android/libs/$(ANDROID_ARCH)
|
||||
QT_BASE_PATH = $(shell find ../depends/sources/ -maxdepth 1 -type f -regex ".*qtbase.*\.tar.xz")
|
||||
QT_BASE_TLD = $(shell tar tf $(QT_BASE_PATH) --exclude='*/*')
|
||||
|
||||
bitcoin_qt_apk: FORCE
|
||||
mkdir -p $(APK_LIB_DIR)
|
||||
cp $(dir $(CC))../sysroot/usr/lib/$(host_alias)/libc++_shared.so $(APK_LIB_DIR)
|
||||
tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/jar/src --strip-components=5
|
||||
tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/java/src --strip-components=5
|
||||
tar xf $(QT_BASE_PATH) -C qt/android/res/ $(QT_BASE_TLD)src/android/java/res --strip-components=5
|
||||
cp qt/bitcoin-qt $(APK_LIB_DIR)/libbitcoin-qt.so
|
||||
cd qt/android && gradle wrapper --gradle-version=6.6.1
|
||||
cd qt/android && ./gradlew build
|
||||
|
||||
ui_%.h: %.ui
|
||||
@test -f $(UIC)
|
||||
@$(MKDIR_P) $(@D)
|
||||
|
||||
@@ -7,3 +7,5 @@ check: FORCE
|
||||
$(MAKE) -C .. test_bitcoin_qt_check
|
||||
bitcoin-qt bitcoin-qt.exe: FORCE
|
||||
$(MAKE) -C .. bitcoin_qt
|
||||
apk: FORCE
|
||||
$(MAKE) -C .. bitcoin_qt_apk
|
||||
|
||||
38
src/qt/android/AndroidManifest.xml
Normal file
38
src/qt/android/AndroidManifest.xml
Normal file
@@ -0,0 +1,38 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<manifest package="org.bitcoincore.qt" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
|
||||
<uses-sdk android:targetSdkVersion="24"/>
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
|
||||
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
|
||||
|
||||
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
|
||||
|
||||
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Bitcoin Core">
|
||||
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
|
||||
android:name="org.bitcoincore.qt.BitcoinQtActivity"
|
||||
android:label="Bitcoin Core"
|
||||
android:icon="@drawable/bitcoin"
|
||||
android:screenOrientation="unspecified"
|
||||
android:launchMode="singleTop">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
</intent-filter>
|
||||
|
||||
<meta-data android:name="android.app.arguments" android:value="-testnet"/>
|
||||
<meta-data android:name="android.app.lib_name" android:value="bitcoin-qt"/>
|
||||
<meta-data android:name="android.app.repository" android:value="default"/>
|
||||
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/>
|
||||
<meta-data android:name="android.app.use_local_qt_libs" android:value="1"/>
|
||||
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
|
||||
<meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/>
|
||||
<meta-data android:name="android.app.background_running" android:value="true"/>
|
||||
<meta-data android:name="android.app.auto_screen_scale_factor" android:value="true"/>
|
||||
<meta-data android:name="android.app.extract_android_style" android:value="default"/>
|
||||
</activity>
|
||||
|
||||
</application>
|
||||
</manifest>
|
||||
52
src/qt/android/build.gradle
Normal file
52
src/qt/android/build.gradle
Normal file
@@ -0,0 +1,52 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.1.0'
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
}
|
||||
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion androidCompileSdkVersion.toInteger()
|
||||
|
||||
buildToolsVersion androidBuildToolsVersion
|
||||
|
||||
sourceSets {
|
||||
main {
|
||||
manifest.srcFile 'AndroidManifest.xml'
|
||||
java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
|
||||
aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
|
||||
res.srcDirs = [qt5AndroidDir + '/res', 'res']
|
||||
resources.srcDirs = ['src']
|
||||
renderscript.srcDirs = ['src']
|
||||
assets.srcDirs = ['assets']
|
||||
jniLibs.srcDirs = ['libs']
|
||||
}
|
||||
}
|
||||
|
||||
lintOptions {
|
||||
abortOnError false
|
||||
}
|
||||
|
||||
dexOptions {
|
||||
javaMaxHeapSize '4g'
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 24
|
||||
}
|
||||
}
|
||||
4
src/qt/android/gradle.properties
Normal file
4
src/qt/android/gradle.properties
Normal file
@@ -0,0 +1,4 @@
|
||||
androidBuildToolsVersion=28.0.3
|
||||
androidCompileSdkVersion=28
|
||||
qt5AndroidDir=new File(".").absolutePath
|
||||
org.gradle.jvmargs=-Xmx4608M
|
||||
BIN
src/qt/android/res/drawable-hdpi/bitcoin.png
Normal file
BIN
src/qt/android/res/drawable-hdpi/bitcoin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.4 KiB |
BIN
src/qt/android/res/drawable-ldpi/bitcoin.png
Normal file
BIN
src/qt/android/res/drawable-ldpi/bitcoin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
BIN
src/qt/android/res/drawable-mdpi/bitcoin.png
Normal file
BIN
src/qt/android/res/drawable-mdpi/bitcoin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
BIN
src/qt/android/res/drawable-xhdpi/bitcoin.png
Normal file
BIN
src/qt/android/res/drawable-xhdpi/bitcoin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.7 KiB |
BIN
src/qt/android/res/drawable-xxhdpi/bitcoin.png
Normal file
BIN
src/qt/android/res/drawable-xxhdpi/bitcoin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
src/qt/android/res/drawable-xxxhdpi/bitcoin.png
Normal file
BIN
src/qt/android/res/drawable-xxxhdpi/bitcoin.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
29
src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java
Normal file
29
src/qt/android/src/org/bitcoincore/qt/BitcoinQtActivity.java
Normal file
@@ -0,0 +1,29 @@
|
||||
package org.bitcoincore.qt;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.system.ErrnoException;
|
||||
import android.system.Os;
|
||||
|
||||
import org.qtproject.qt5.android.bindings.QtActivity;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
public class BitcoinQtActivity extends QtActivity
|
||||
{
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState)
|
||||
{
|
||||
final File bitcoinDir = new File(getFilesDir().getAbsolutePath() + "/.bitcoin");
|
||||
if (!bitcoinDir.exists()) {
|
||||
bitcoinDir.mkdir();
|
||||
}
|
||||
|
||||
try {
|
||||
Os.setenv("QT_QPA_PLATFORM", "android", true);
|
||||
} catch (ErrnoException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
super.onCreate(savedInstanceState);
|
||||
}
|
||||
}
|
||||
@@ -466,6 +466,12 @@ int GuiMain(int argc, char* argv[])
|
||||
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
|
||||
#if defined(QT_QPA_PLATFORM_ANDROID)
|
||||
QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
|
||||
QApplication::setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
|
||||
QApplication::setAttribute(Qt::AA_DontUseNativeDialogs);
|
||||
#endif
|
||||
|
||||
BitcoinApplication app;
|
||||
QFontDatabase::addApplicationFont(":/fonts/monospace");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user