From 75ddfbd0ec2b9c6df8ebc964eae9760ea13da451 Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Tue, 25 Jun 2019 14:19:40 -0500 Subject: [PATCH] Split bulk of android project into a common folder --- pkg/android/phoenix-common/.gitignore | 5 +++++ .../{phoenix => phoenix-common}/jni/Android.mk | 0 .../{phoenix => phoenix-common}/jni/Application.mk | 0 .../res/drawable-hdpi/ic_launcher.png | Bin .../res/drawable-ldpi/ic_launcher.png | Bin .../res/drawable-mdpi/ic_launcher.png | Bin .../res/drawable-xhdpi/banner.png | Bin .../res/drawable-xhdpi/ic_launcher.png | Bin .../res/drawable-xxhdpi/ic_launcher.png | Bin .../res/drawable-xxxhdpi/ic_launcher.png | Bin .../browser/preferences/util/ConfigFile.java | 0 .../browser/preferences/util/UserPreferences.java | 0 .../browser/retroactivity/RetroActivityCamera.java | 0 .../browser/retroactivity/RetroActivityCommon.java | 0 .../browser/retroactivity/RetroActivityIntent.java | 0 15 files changed, 5 insertions(+) create mode 100644 pkg/android/phoenix-common/.gitignore rename pkg/android/{phoenix => phoenix-common}/jni/Android.mk (100%) rename pkg/android/{phoenix => phoenix-common}/jni/Application.mk (100%) rename pkg/android/{phoenix => phoenix-common}/res/drawable-hdpi/ic_launcher.png (100%) rename pkg/android/{phoenix => phoenix-common}/res/drawable-ldpi/ic_launcher.png (100%) rename pkg/android/{phoenix => phoenix-common}/res/drawable-mdpi/ic_launcher.png (100%) rename pkg/android/{phoenix => phoenix-common}/res/drawable-xhdpi/banner.png (100%) rename pkg/android/{phoenix => phoenix-common}/res/drawable-xhdpi/ic_launcher.png (100%) rename pkg/android/{phoenix => phoenix-common}/res/drawable-xxhdpi/ic_launcher.png (100%) rename pkg/android/{phoenix => phoenix-common}/res/drawable-xxxhdpi/ic_launcher.png (100%) rename pkg/android/{phoenix => phoenix-common}/src/com/retroarch/browser/preferences/util/ConfigFile.java (100%) rename pkg/android/{phoenix => phoenix-common}/src/com/retroarch/browser/preferences/util/UserPreferences.java (100%) rename pkg/android/{phoenix => phoenix-common}/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java (100%) rename pkg/android/{phoenix => phoenix-common}/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java (100%) rename pkg/android/{phoenix => phoenix-common}/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java (100%) diff --git a/pkg/android/phoenix-common/.gitignore b/pkg/android/phoenix-common/.gitignore new file mode 100644 index 0000000000..859bcd7938 --- /dev/null +++ b/pkg/android/phoenix-common/.gitignore @@ -0,0 +1,5 @@ +/gen +/bin +/libs/*/*.so +/obj +/jni/modules/*.so diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix-common/jni/Android.mk similarity index 100% rename from pkg/android/phoenix/jni/Android.mk rename to pkg/android/phoenix-common/jni/Android.mk diff --git a/pkg/android/phoenix/jni/Application.mk b/pkg/android/phoenix-common/jni/Application.mk similarity index 100% rename from pkg/android/phoenix/jni/Application.mk rename to pkg/android/phoenix-common/jni/Application.mk diff --git a/pkg/android/phoenix/res/drawable-hdpi/ic_launcher.png b/pkg/android/phoenix-common/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from pkg/android/phoenix/res/drawable-hdpi/ic_launcher.png rename to pkg/android/phoenix-common/res/drawable-hdpi/ic_launcher.png diff --git a/pkg/android/phoenix/res/drawable-ldpi/ic_launcher.png b/pkg/android/phoenix-common/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from pkg/android/phoenix/res/drawable-ldpi/ic_launcher.png rename to pkg/android/phoenix-common/res/drawable-ldpi/ic_launcher.png diff --git a/pkg/android/phoenix/res/drawable-mdpi/ic_launcher.png b/pkg/android/phoenix-common/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from pkg/android/phoenix/res/drawable-mdpi/ic_launcher.png rename to pkg/android/phoenix-common/res/drawable-mdpi/ic_launcher.png diff --git a/pkg/android/phoenix/res/drawable-xhdpi/banner.png b/pkg/android/phoenix-common/res/drawable-xhdpi/banner.png similarity index 100% rename from pkg/android/phoenix/res/drawable-xhdpi/banner.png rename to pkg/android/phoenix-common/res/drawable-xhdpi/banner.png diff --git a/pkg/android/phoenix/res/drawable-xhdpi/ic_launcher.png b/pkg/android/phoenix-common/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from pkg/android/phoenix/res/drawable-xhdpi/ic_launcher.png rename to pkg/android/phoenix-common/res/drawable-xhdpi/ic_launcher.png diff --git a/pkg/android/phoenix/res/drawable-xxhdpi/ic_launcher.png b/pkg/android/phoenix-common/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from pkg/android/phoenix/res/drawable-xxhdpi/ic_launcher.png rename to pkg/android/phoenix-common/res/drawable-xxhdpi/ic_launcher.png diff --git a/pkg/android/phoenix/res/drawable-xxxhdpi/ic_launcher.png b/pkg/android/phoenix-common/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from pkg/android/phoenix/res/drawable-xxxhdpi/ic_launcher.png rename to pkg/android/phoenix-common/res/drawable-xxxhdpi/ic_launcher.png diff --git a/pkg/android/phoenix/src/com/retroarch/browser/preferences/util/ConfigFile.java b/pkg/android/phoenix-common/src/com/retroarch/browser/preferences/util/ConfigFile.java similarity index 100% rename from pkg/android/phoenix/src/com/retroarch/browser/preferences/util/ConfigFile.java rename to pkg/android/phoenix-common/src/com/retroarch/browser/preferences/util/ConfigFile.java diff --git a/pkg/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java b/pkg/android/phoenix-common/src/com/retroarch/browser/preferences/util/UserPreferences.java similarity index 100% rename from pkg/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java rename to pkg/android/phoenix-common/src/com/retroarch/browser/preferences/util/UserPreferences.java diff --git a/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java b/pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java similarity index 100% rename from pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java rename to pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java diff --git a/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java b/pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java similarity index 100% rename from pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java rename to pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java diff --git a/pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java b/pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java similarity index 100% rename from pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java rename to pkg/android/phoenix-common/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java