Skip to content

Commit a53ff97

Browse files
committed
Android.bp: Fix building on AOSP 14 (finally)
1 parent 06fe15b commit a53ff97

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

Android.bp

+6-14
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,11 @@ java_library {
1414

1515
android_library {
1616
name: "OpenEUICC-common",
17+
defaults: [
18+
"OpenEUICC-deps-defaults",
19+
],
1720
static_libs: [
1821
"net.typeblog.lpac_jni",
19-
20-
// Dependencies that must be pulled from maven,
21-
"zxing-core-prebuilt-jar",
22-
"zxing-android-embedded-prebuilt-aar",
23-
24-
// Dependencies included with AOSP
25-
"androidx.appcompat_appcompat",
26-
"androidx.cardview_cardview",
27-
"androidx-constraintlayout_constraintlayout",
28-
"androidx.core_core-ktx",
29-
"androidx.lifecycle_lifecycle-runtime-ktx",
30-
"androidx.preference_preference",
31-
"androidx.swiperefreshlayout_swiperefreshlayout",
32-
"com.google.android.material_material",
3322
"kotlinx_coroutines",
3423
],
3524
srcs: [
@@ -41,6 +30,9 @@ android_library {
4130
resource_dirs: [
4231
"app-common/src/main/res",
4332
],
33+
kotlincflags: [
34+
"-opt-in=kotlin.ExperimentalStdlibApi",
35+
],
4436
manifest: "app-common/src/main/AndroidManifest.xml",
4537
system_ext_specific: true,
4638
}

0 commit comments

Comments
 (0)