Update min_sdk_version to 35
Change the profiling module min_sdk_version from current to 35. This is
in preparation for a new build enforcement that does not allow
min_sdk_version to be set to current for apexes.
Bug: 221087384
Test: manual build and flash, atest CtsProfilingModuleTests
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e8eb0824dae30d98bc409eaa059aeca2549bba21)
Merged-In: I39af4942588c276f7a3d66b2920a17f87d820647
Change-Id: I39af4942588c276f7a3d66b2920a17f87d820647
diff --git a/apex/Android.bp b/apex/Android.bp
index f890da6..8a7830b 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -54,7 +54,7 @@
key: "com.android.profiling.key",
certificate: ":com.android.profiling.certificate",
defaults: ["v-launched-apex-module"],
- min_sdk_version: "current",
+ min_sdk_version: "35",
bootclasspath_fragments: ["com.android.profiling-bootclasspath-fragment"],
systemserverclasspath_fragments: ["com.android.profiling-systemserverclasspath-fragment"],
diff --git a/framework/Android.bp b/framework/Android.bp
index ee1f609..45575ac 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -74,7 +74,7 @@
apex_available: [
"com.android.profiling",
],
- min_sdk_version: "current",
+ min_sdk_version: "35",
}
aconfig_declarations {
@@ -92,6 +92,7 @@
"com.android.profiling",
],
mode: "exported",
+ min_sdk_version: "35",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
visibility: [
"//packages/modules/Profiling:__subpackages__",
diff --git a/service/Android.bp b/service/Android.bp
index 51c6b76..fa5646a 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -45,7 +45,7 @@
apex_available: [
"com.android.profiling",
],
- min_sdk_version: "current",
+ min_sdk_version: "35",
installable: true,
}
@@ -66,7 +66,7 @@
"//packages/modules/Profiling/tests:__subpackages__",
],
installable: false,
- min_sdk_version: "current",
+ min_sdk_version: "35",
sdk_version: "system_server_current",
apex_available: [
"com.android.profiling",
diff --git a/tests/cts/Android.bp b/tests/cts/Android.bp
index 2f7563a..e9b51c2 100644
--- a/tests/cts/Android.bp
+++ b/tests/cts/Android.bp
@@ -32,6 +32,6 @@
"cts",
"general-tests",
],
- min_sdk_version: "current",
+ min_sdk_version: "35",
sdk_version: "module_current",
}
