bf82b12896
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
41 lines
1.2 KiB
Plaintext
41 lines
1.2 KiB
Plaintext
//
|
|
// Copyright (C) 2021 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
// APK to hold all the wifi overlayable resources.
|
|
package {
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
android_app {
|
|
name: "ServiceConnectivityResources",
|
|
sdk_version: "module_current",
|
|
min_sdk_version: "30",
|
|
resource_dirs: [
|
|
"res",
|
|
],
|
|
privileged: true,
|
|
export_package_resources: true,
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
certificate: ":com.android.connectivity.resources.certificate",
|
|
}
|
|
|
|
android_app_certificate {
|
|
name: "com.android.connectivity.resources.certificate",
|
|
certificate: "resources-certs/com.android.connectivity.resources",
|
|
}
|