From bf82b12896d51b1f852136a34e3664c9637046f5 Mon Sep 17 00:00:00 2001 From: Harshit Mahajan Date: Tue, 23 Aug 2022 18:57:39 +0000 Subject: [PATCH] [ServiceConnectivityResources] 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 'ServiceConnectivityResources.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: I84b7d29d9da2cb611ce1045bba27660c33165a79 --- service/ServiceConnectivityResources/Android.bp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/service/ServiceConnectivityResources/Android.bp b/service/ServiceConnectivityResources/Android.bp index 02b2875942..2260596565 100644 --- a/service/ServiceConnectivityResources/Android.bp +++ b/service/ServiceConnectivityResources/Android.bp @@ -21,9 +21,8 @@ package { android_app { name: "ServiceConnectivityResources", - sdk_version: "module_30", + sdk_version: "module_current", min_sdk_version: "30", - target_sdk_version: "33", resource_dirs: [ "res", ],