Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 835cb880 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Android (Google) Code Review
Browse files

Merge "Add android.sdk aconfig flags" into main

parents 00a555c7 37d29544
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ aconfig_declarations_group {
    java_aconfig_libraries: [
        // !!! KEEP THIS LIST ALPHABETICAL !!!
        "aconfig_mediacodec_flags_java_lib",
        "android-sdk-flags-java",
        "android.adaptiveauth.flags-aconfig-java",
        "android.app.appfunctions.flags-aconfig-java",
        "android.app.contextualsearch.flags-aconfig-java",
+30 −0
Original line number Diff line number Diff line
// Copyright (C) 2024 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.

package {
    default_applicable_licenses: ["frameworks_base_license"],
}

aconfig_declarations {
    name: "android-sdk-flags",
    package: "android.sdk",
    container: "system",
    srcs: ["flags.aconfig"],
}

java_aconfig_library {
    name: "android-sdk-flags-java",
    aconfig_declarations: "android-sdk-flags",
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+12 −0
Original line number Diff line number Diff line
package: "android.sdk"
container: "system"

flag {
    name: "major_minor_versioning_scheme"
    namespace: "android_sdk"
    description: "Use the new SDK major.minor versioning scheme (e.g. Android 40.1) which replaces the old single-integer scheme (e.g. Android 15)."
    bug: "350458259"

    # Use is_fixed_read_only because DeviceConfig may not be available when Build.VERSION_CODES is first accessed
    is_fixed_read_only: true
}