Fixup Android.bp build after app-common split
This commit is contained in:
parent
af75b8f5fb
commit
b0627a1dc0
40
Android.bp
40
Android.bp
|
@ -1,6 +1,19 @@
|
||||||
android_app {
|
java_library {
|
||||||
name: "OpenEUICC",
|
name: "net.typeblog.lpac_jni",
|
||||||
|
srcs: [
|
||||||
|
"libs/lpac-jni/src/main/**/*.kt",
|
||||||
|
],
|
||||||
|
optimize: {
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
|
system_ext_specific: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
android_library {
|
||||||
|
name: "OpenEUICC-common",
|
||||||
static_libs: [
|
static_libs: [
|
||||||
|
"net.typeblog.lpac_jni",
|
||||||
|
|
||||||
// Dependencies that must be pulled from maven,
|
// Dependencies that must be pulled from maven,
|
||||||
"zxing-core-prebuilt-jar",
|
"zxing-core-prebuilt-jar",
|
||||||
"zxing-android-embedded-prebuilt-aar",
|
"zxing-android-embedded-prebuilt-aar",
|
||||||
|
@ -13,18 +26,31 @@ android_app {
|
||||||
"androidx.lifecycle_lifecycle-runtime-ktx",
|
"androidx.lifecycle_lifecycle-runtime-ktx",
|
||||||
"androidx.swiperefreshlayout_swiperefreshlayout",
|
"androidx.swiperefreshlayout_swiperefreshlayout",
|
||||||
"com.google.android.material_material",
|
"com.google.android.material_material",
|
||||||
"gson",
|
|
||||||
"kotlinx_coroutines",
|
"kotlinx_coroutines",
|
||||||
],
|
],
|
||||||
|
srcs: [
|
||||||
|
"app-common/src/main/**/*.kt",
|
||||||
|
],
|
||||||
|
optimize: {
|
||||||
|
enabled: false,
|
||||||
|
},
|
||||||
|
resource_dirs: [
|
||||||
|
"app-common/src/main/res",
|
||||||
|
],
|
||||||
|
manifest: "app-common/src/main/AndroidManifest.xml",
|
||||||
|
system_ext_specific: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
android_app {
|
||||||
|
name: "OpenEUICC",
|
||||||
|
static_libs: [
|
||||||
|
"OpenEUICC-common",
|
||||||
|
],
|
||||||
jni_libs: [
|
jni_libs: [
|
||||||
"liblpac-jni",
|
"liblpac-jni",
|
||||||
],
|
],
|
||||||
srcs: [
|
srcs: [
|
||||||
// Main app
|
|
||||||
"app/src/main/**/*.kt",
|
"app/src/main/**/*.kt",
|
||||||
|
|
||||||
// lpac-jni interface
|
|
||||||
"libs/lpac-jni/src/main/**/*.kt",
|
|
||||||
],
|
],
|
||||||
optimize: {
|
optimize: {
|
||||||
enabled: false,
|
enabled: false,
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:tools="http://schemas.android.com/tools"
|
<manifest xmlns:tools="http://schemas.android.com/tools"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="im.angry.openeuicc.common">
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
@ -12,4 +13,4 @@
|
||||||
android:screenOrientation="fullSensor"
|
android:screenOrientation="fullSensor"
|
||||||
tools:replace="screenOrientation" />
|
tools:replace="screenOrientation" />
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
Loading…
Reference in a new issue