Merge "Fix inconsistencies of ConfigInfra module bp file" into udc-dev am: e256a6cb09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ConfigInfrastructure/+/21989226
Change-Id: I6d2cf063be0145f29942f8c4578b8991a4c0f55a
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/apex/Android.bp b/apex/Android.bp
index 3c91cce..f221097 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -81,7 +81,8 @@
],
key: "com.android.configinfrastructure.key",
certificate: ":com.android.configinfrastructure.certificate",
- updatable: false,
+ updatable: true,
+ min_sdk_version: "UpsideDownCake",
}
sdk {
diff --git a/framework/Android.bp b/framework/Android.bp
index 747fac1..64e14d7 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -19,12 +19,11 @@
java_sdk_library {
name: "framework-configinfrastructure",
srcs: [ "java/**/*.java" ],
- defaults: ["framework-module-defaults"],
+ defaults: ["framework-module-defaults", "u-launched-apex-module"],
permitted_packages: [ "android.provider" ],
apex_available: [
"com.android.configinfrastructure",
],
- min_sdk_version: "33",
sdk_version: "module_current",
impl_library_visibility: [
"//packages/modules/ConfigInfrastructure:__subpackages__"
diff --git a/service/Android.bp b/service/Android.bp
index 83512ba..7b364c1 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -22,6 +22,7 @@
defaults: [
"framework-system-server-module-defaults",
"framework-system-server-module-optimize-defaults",
+ "u-launched-apex-module",
],
permitted_packages: [
"android.provider",
@@ -36,7 +37,6 @@
libs: [
"framework-configinfrastructure.impl",
],
- min_sdk_version: "33",
sdk_version: "system_server_current",
jarjar_rules: "jarjar-rules.txt",
}
