diff --git a/Tethering/Android.bp b/Tethering/Android.bp index 23ce1a47883c6e312cfdd9b9859d0450bf86f160..4478b1e92a5480501781861b72ecd6908a871c49 100644 --- a/Tethering/Android.bp +++ b/Tethering/Android.bp @@ -195,7 +195,7 @@ android_app { certificate: "networkstack", manifest: "AndroidManifest.xml", use_embedded_native_libs: true, - required: ["privapp_allowlist_com.android.tethering"], + privapp_allowlist: ":privapp_allowlist_com.android.tethering", apex_available: ["com.android.tethering"], lint: { strict_updatability_linting: true }, } @@ -211,7 +211,7 @@ android_app { certificate: "networkstack", manifest: "AndroidManifest.xml", use_embedded_native_libs: true, - required: ["privapp_allowlist_com.android.tethering"], + privapp_allowlist: ":privapp_allowlist_com.android.tethering", apex_available: ["com.android.tethering"], lint: { strict_updatability_linting: true }, } diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp index 4bfd1fbeda8714e47e10b33e9278842eaf5d872c..cf9b359952d0566c99c601c2412b71d2dacbddb4 100644 --- a/Tethering/apex/Android.bp +++ b/Tethering/apex/Android.bp @@ -112,10 +112,7 @@ apex { "ServiceConnectivityResources", "HalfSheetUX", ], - prebuilts: [ - "current_sdkinfo", - "privapp_allowlist_com.android.tethering", - ], + prebuilts: ["current_sdkinfo"], manifest: "manifest.json", key: "com.android.tethering.key", // Indicates that pre-installed version of this apex can be compressed. diff --git a/Tethering/apex/permissions/Android.bp b/Tethering/apex/permissions/Android.bp index ac9ec65dd547369e0c466cd825b01b195647f0e7..69c1aa2d4c383bfa55e107c2ff8a0af728bb3a34 100644 --- a/Tethering/apex/permissions/Android.bp +++ b/Tethering/apex/permissions/Android.bp @@ -19,10 +19,7 @@ package { default_visibility: ["//packages/modules/Connectivity/Tethering:__subpackages__"], } -prebuilt_etc { +filegroup { name: "privapp_allowlist_com.android.tethering", - sub_dir: "permissions", - filename: "permissions.xml", - src: "permissions.xml", - installable: false, + srcs: ["permissions.xml"], } \ No newline at end of file