From a53ff97ecccfaac887d98bbb8f1feabde97230be Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sun, 21 Jan 2024 16:51:18 -0500 Subject: [PATCH] Android.bp: Fix building on AOSP 14 (finally) --- Android.bp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/Android.bp b/Android.bp index f8630bd..fe677dc 100644 --- a/Android.bp +++ b/Android.bp @@ -14,22 +14,11 @@ java_library { android_library { name: "OpenEUICC-common", + defaults: [ + "OpenEUICC-deps-defaults", + ], static_libs: [ "net.typeblog.lpac_jni", - - // Dependencies that must be pulled from maven, - "zxing-core-prebuilt-jar", - "zxing-android-embedded-prebuilt-aar", - - // Dependencies included with AOSP - "androidx.appcompat_appcompat", - "androidx.cardview_cardview", - "androidx-constraintlayout_constraintlayout", - "androidx.core_core-ktx", - "androidx.lifecycle_lifecycle-runtime-ktx", - "androidx.preference_preference", - "androidx.swiperefreshlayout_swiperefreshlayout", - "com.google.android.material_material", "kotlinx_coroutines", ], srcs: [ @@ -41,6 +30,9 @@ android_library { resource_dirs: [ "app-common/src/main/res", ], + kotlincflags: [ + "-opt-in=kotlin.ExperimentalStdlibApi", + ], manifest: "app-common/src/main/AndroidManifest.xml", system_ext_specific: true, }