Merge 24Q4 (ab/12406339) into aosp-main-future
Bug: 370570306
Merged-In: Ifc3f0526d470cc7bdfda8c610fc19bfdca73fe92
Change-Id: I00b44fc0a021e1df39e5287ff98c113341e548e5
diff --git a/Android.bp b/Android.bp
index 4954e3b..a0c036d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,9 +19,9 @@
name: "CellBroadcastCommon",
defaults: ["CellBroadcastDefaults"],
srcs: [
- "src/**/*.java",
- ":cellbroadcast-constants-shared-srcs",
- ":statslog-cellbroadcast-module-java-gen",
+ "src/**/*.java",
+ ":cellbroadcast-constants-shared-srcs",
+ ":statslog-cellbroadcast-module-java-gen",
],
libs: [
"framework-annotations-lib",
@@ -45,7 +45,7 @@
],
resource_dirs: ["res"],
manifest: "AndroidManifest_Lib.xml",
- apex_available : [
+ apex_available: [
"com.android.cellbroadcast",
"//apex_available:platform",
],
@@ -61,6 +61,7 @@
apex_available: ["com.android.cellbroadcast"],
privapp_allowlist: ":privapp_allowlist_com.android.cellbroadcastreceiver.module.xml",
resource_dirs: [],
+ updatable: true,
}
android_app {
@@ -71,7 +72,10 @@
certificate: "platform",
// CellBroadcastAppPlatform is a replacement for com.android.cellbroadcast apex which consists
// of CellBroadcastApp
- overrides: ["com.android.cellbroadcast", "CellBroadcastLegacyApp"],
+ overrides: [
+ "com.android.cellbroadcast",
+ "CellBroadcastLegacyApp",
+ ],
manifest: "AndroidManifest_Platform.xml",
system_ext_specific: true,
privileged: true,
@@ -96,7 +100,8 @@
},
srcs: ["proto/*.proto"],
sdk_version: "core_current",
- apex_available : ["com.android.cellbroadcast",
- "//apex_available:platform",
+ apex_available: [
+ "com.android.cellbroadcast",
+ "//apex_available:platform",
],
}
