[ServiceUwbResources] Remove explicit targetSdkVersion
Going forward targetSdkVersion would be set by build system.
It would be by default set to 10000 before SDK finalization,
and updated to the new API level after finalization.
Effectively it would mean:
1. '10000' in aosp and internal master
2. Finalized number in development branches like "33" in "tm-dev"
3. As sdk hasn't been finalised in "udc-dev", it would be "10000"
which would be automatically updated to finalized version after sdk finalization.
Removing the target sdk version declaration from the blueprint and manifest files.
More details can be found here go/mainline-modules-target-sdk-version-fix
Bug: b/242296003
Test: croot; sdks=`find ./out -name 'ServiceUwbResources.apk' | grep -v .intermediates`; echo $sdks; for sdk in $sdks;do aapt2 dump badging `echo $sdk` | grep targetSdkVersion:; done
1. outputs 33 in tm-mainline-prod
2. outputs 10000 in master
Change-Id: I07fc650a2cc535fbc42076a3a3e6c11c737aaddd
diff --git a/framework/Android.bp b/framework/Android.bp
index 2658430..58bf8f6 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -19,7 +19,6 @@
java_defaults {
name: "uwb-module-sdk-version-defaults",
min_sdk_version: "Tiramisu",
- target_sdk_version: "Tiramisu",
}
filegroup {
diff --git a/indev_uwb_adaptation/tests/Android.bp b/indev_uwb_adaptation/tests/Android.bp
index 132b2ed..e681fcb 100644
--- a/indev_uwb_adaptation/tests/Android.bp
+++ b/indev_uwb_adaptation/tests/Android.bp
@@ -21,6 +21,7 @@
android_test {
name: "IndevUwbServiceTests",
defaults: ["uwb-module-sdk-version-defaults"],
+ target_sdk_version: "33",
srcs: ["src/**/*.java"],
diff --git a/service/ServiceUwbResources/Android.bp b/service/ServiceUwbResources/Android.bp
index af67c9e..5aca422 100644
--- a/service/ServiceUwbResources/Android.bp
+++ b/service/ServiceUwbResources/Android.bp
@@ -26,7 +26,7 @@
"res",
],
privileged: true,
- sdk_version: "system_Tiramisu",
+ sdk_version: "system_current",
export_package_resources: true,
apex_available: [
"com.android.uwb",
