diff --git a/bitrise.yml b/bitrise.yml
new file mode 100644
index 000000000..4da48bdb1
--- /dev/null
+++ b/bitrise.yml
@@ -0,0 +1,108 @@
+---
+format_version: '6'
+default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
+project_type: android
+trigger_map:
+- push_branch: "*"
+ workflow: primary
+- pull_request_source_branch: "*"
+ workflow: primary
+workflows:
+ deploy:
+ description: |
+ ## How to get a signed APK
+
+ This workflow contains the **Sign APK** step. To sign your APK all you have to do is to:
+
+ 1. Click on **Code Signing** tab
+ 1. Find the **ANDROID KEYSTORE FILE** section
+ 1. Click or drop your file on the upload file field
+ 1. Fill the displayed 3 input fields:
+ 1. **Keystore password**
+ 1. **Keystore alias**
+ 1. **Private key password**
+ 1. Click on **[Save metadata]** button
+
+ That's it! From now on, **Sign APK** step will receive your uploaded files.
+
+ ## To run this workflow
+
+ If you want to run this workflow manually:
+
+ 1. Open the app's build list page
+ 2. Click on **[Start/Schedule a Build]** button
+ 3. Select **deploy** in **Workflow** dropdown input
+ 4. Click **[Start Build]** button
+
+ Or if you need this workflow to be started by a GIT event:
+
+ 1. Click on **Triggers** tab
+ 2. Setup your desired event (push/tag/pull) and select **deploy** workflow
+ 3. Click on **[Done]** and then **[Save]** buttons
+
+ The next change in your repository that matches any of your trigger map event will start **deploy** workflow.
+ steps:
+ - activate-ssh-key@4.0.3:
+ run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
+ - git-clone@4.0.11: {}
+ - cache-pull@2.0.1: {}
+ - script@1.1.5:
+ title: Do anything with Script step
+ - install-missing-android-tools@2.2.0:
+ inputs:
+ - gradlew_path: "$PROJECT_LOCATION/gradlew"
+ - change-android-versioncode-and-versionname@1.1.1:
+ inputs:
+ - build_gradle_path: "$PROJECT_LOCATION/$MODULE/build.gradle"
+ - android-lint@0.9.4:
+ inputs:
+ - project_location: "$PROJECT_LOCATION"
+ - module: "$MODULE"
+ - variant: "$TEST_VARIANT"
+ - android-unit-test@0.9.3:
+ inputs:
+ - project_location: "$PROJECT_LOCATION"
+ - module: "$MODULE"
+ - variant: "$TEST_VARIANT"
+ - android-build@0.9.5:
+ inputs:
+ - project_location: "$PROJECT_LOCATION"
+ - module: "$MODULE"
+ - variant: "$BUILD_VARIANT"
+ - sign-apk@1.2.3:
+ run_if: '{{getenv "BITRISEIO_ANDROID_KEYSTORE_URL" | ne ""}}'
+ - deploy-to-bitrise-io@1.3.15: {}
+ - cache-push@2.0.5: {}
+ primary:
+ steps:
+ - cache-pull@2.0.1: {}
+ - script@1.1.5:
+ title: Do anything with Script step
+ - install-missing-android-tools@2.2.0:
+ inputs:
+ - gradlew_path: "$PROJECT_LOCATION/gradlew"
+ - android-lint@0.9.4:
+ inputs:
+ - project_location: "$PROJECT_LOCATION"
+ - module: "$MODULE"
+ - variant: "$TEST_VARIANT"
+ - android-build@0.9.5:
+ inputs:
+ - variant: Debug
+ - project_location: "$PROJECT_LOCATION"
+ - deploy-to-bitrise-io@1.3.15: {}
+ - cache-push@2.0.5: {}
+app:
+ envs:
+ - opts:
+ is_expand: false
+ PROJECT_LOCATION: src/android
+ - opts:
+ is_expand: false
+ MODULE: app
+ - opts:
+ is_expand: false
+ BUILD_VARIANT: Release
+ - opts:
+ is_expand: false
+ TEST_VARIANT: Debug
diff --git a/src/android/.gitignore b/src/android/.gitignore
new file mode 100644
index 000000000..5edb4eeb0
--- /dev/null
+++ b/src/android/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/src/android/app/CMakeLists.txt b/src/android/app/CMakeLists.txt
new file mode 100644
index 000000000..af3c3f62b
--- /dev/null
+++ b/src/android/app/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.6.0)
+
+# TODO: actually add files to compile
+
+# find Android's log library
+find_library(log-lib log)
diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle
new file mode 100644
index 000000000..921f26a88
--- /dev/null
+++ b/src/android/app/build.gradle
@@ -0,0 +1,139 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 26
+ buildToolsVersion '28.0.3'
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ lintOptions {
+ // This is important as it will run lint but not abort on error
+ // Lint has some overly obnoxious "errors" that should really be warnings
+ abortOnError false
+ }
+
+ defaultConfig {
+ applicationId "org.citra_emu"
+ minSdkVersion 21
+ targetSdkVersion 26
+
+ versionCode(getBuildVersionCode())
+
+ versionName "${getVersion()}"
+ }
+
+ signingConfigs {
+ release {
+ if (project.hasProperty('keystore')) {
+ storeFile file(project.property('keystore'))
+ storePassword project.property('storepass')
+ keyAlias project.property('keyalias')
+ keyPassword project.property('keypass')
+ }
+ }
+ }
+
+ // Define build types, which are orthogonal to product flavors.
+ buildTypes {
+ // Signed by release key, allowing for upload to Play Store.
+ release {
+ signingConfig signingConfigs.release
+ }
+
+ // Signed by debug key disallowing distribution on Play Store.
+ // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
+ debug {
+ // TODO If this is ever modified, change application_id in debug/strings.xml
+ applicationIdSuffix ".debug"
+ versionNameSuffix '-debug'
+ jniDebuggable true
+ }
+ }
+
+ externalNativeBuild {
+ cmake {
+ version getCmakeVersion()
+ path "CMakeLists.txt"
+ }
+ }
+
+ defaultConfig {
+ externalNativeBuild {
+ cmake {
+ cppFlags "-std=c++17"
+ arguments "-DENABLE_QT=0", // Don't use QT
+ "-DENABLE_SDL2=0", // Don't use SDL
+ "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work
+ "-DENABLE_CUBEB=0"
+ "-DANDROID_STL=c++_shared"
+
+ abiFilters "arm64-v8a", "x86_64"
+ }
+ }
+ }
+}
+
+ext {
+ androidSupportVersion = '26.1.0'
+}
+
+dependencies {
+ implementation "com.android.support:support-v13:$androidSupportVersion"
+ implementation "com.android.support:cardview-v7:$androidSupportVersion"
+ implementation "com.android.support:recyclerview-v7:$androidSupportVersion"
+ implementation "com.android.support:design:$androidSupportVersion"
+
+ // Android TV UI libraries.
+ implementation "com.android.support:leanback-v17:$androidSupportVersion"
+
+ implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+
+ testImplementation "com.android.support.test:runner:1.0.2"
+ androidTestImplementation "com.android.support.test:runner:1.0.1"
+}
+
+def getVersion() {
+ def versionNumber = '0.0'
+
+ try {
+ versionNumber = 'git describe --always --long'.execute([], project.rootDir).text
+ .trim()
+ .replaceAll(/(-0)?-[^-]+$/, "")
+ } catch (Exception e) {
+ logger.error('Cannot find git, defaulting to dummy version number')
+ }
+
+ return versionNumber
+}
+
+
+def getBuildVersionCode() {
+ try {
+ def versionNumber = 'git rev-list --first-parent --count HEAD'.execute([], project.rootDir).text
+ .trim()
+ return Integer.valueOf(versionNumber)
+ } catch (Exception e) {
+ logger.error('Cannot find git, defaulting to dummy version number')
+ }
+
+ return 0
+}
+
+def getCmakeVersion() {
+ try {
+ // Tokenized form of the output will be - ["cmake", "version", "M.m.p-rcx"], the version number
+ // will be at index 2
+ def version_string = 'cmake -version'.execute([], project.rootDir).text
+ .trim().tokenize()[2]
+
+ return version_string
+ }
+ catch(Exception e) {
+ logger.error('Cannot find Cmake, using default Cmake')
+ }
+
+ return null
+}
diff --git a/src/android/app/proguard-rules.pro b/src/android/app/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/src/android/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/src/android/app/src/androidTest/java/org/citra_emu/citra/ExampleInstrumentedTest.java b/src/android/app/src/androidTest/java/org/citra_emu/citra/ExampleInstrumentedTest.java
new file mode 100644
index 000000000..7055de885
--- /dev/null
+++ b/src/android/app/src/androidTest/java/org/citra_emu/citra/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package org.citra_emu.citra;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getTargetContext();
+
+ assertEquals("org.citra_emu.citra_android", appContext.getPackageName());
+ }
+}
diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..d4ca5f63e
--- /dev/null
+++ b/src/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/android/app/src/main/java/org/citra_emu/citra/CitraApplication.java b/src/android/app/src/main/java/org/citra_emu/citra/CitraApplication.java
new file mode 100644
index 000000000..07a782853
--- /dev/null
+++ b/src/android/app/src/main/java/org/citra_emu/citra/CitraApplication.java
@@ -0,0 +1,9 @@
+// Copyright 2018 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+package org.citra_emu.citra;
+
+import android.app.Application;
+
+public class CitraApplication extends Application {}
diff --git a/src/android/app/src/main/java/org/citra_emu/citra/ui/main/MainActivity.java b/src/android/app/src/main/java/org/citra_emu/citra/ui/main/MainActivity.java
new file mode 100644
index 000000000..97b36f0c1
--- /dev/null
+++ b/src/android/app/src/main/java/org/citra_emu/citra/ui/main/MainActivity.java
@@ -0,0 +1,18 @@
+// Copyright 2018 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+package org.citra_emu.citra.ui.main;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import org.citra_emu.citra.R;
+
+public final class MainActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ }
+}
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_add.png b/src/android/app/src/main/res/drawable-hdpi/ic_add.png
new file mode 100644
index 000000000..4006b497c
Binary files /dev/null and b/src/android/app/src/main/res/drawable-hdpi/ic_add.png differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_citra.png b/src/android/app/src/main/res/drawable-hdpi/ic_citra.png
new file mode 100644
index 000000000..f32b8ca45
Binary files /dev/null and b/src/android/app/src/main/res/drawable-hdpi/ic_citra.png differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_folder.png b/src/android/app/src/main/res/drawable-hdpi/ic_folder.png
new file mode 100644
index 000000000..f7f540e22
Binary files /dev/null and b/src/android/app/src/main/res/drawable-hdpi/ic_folder.png differ
diff --git a/src/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/src/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..c7bd21dbd
--- /dev/null
+++ b/src/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+
+
+
+
+