diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp index 164bda41db..5be393373e 100644 --- a/Tethering/apex/Android.bp +++ b/Tethering/apex/Android.bp @@ -20,17 +20,22 @@ package { apex { name: "com.android.tethering", - // TODO: make updatable again once this contains only updatable artifacts (in particular, this - // cannot build as updatable unless service-connectivity builds against stable API). - updatable: false, - // min_sdk_version: "30", + compile_multilib: "both", + updatable: true, + min_sdk_version: "30", java_libs: [ + "framework-connectivity", "framework-tethering", "service-connectivity", ], - jni_libs: [ - "libservice-connectivity", - ], + multilib: { + first: { + jni_libs: ["libservice-connectivity"] + }, + both: { + jni_libs: ["libframework-connectivity-jni"], + } + }, bpfs: [ "offload.o", "test.o",