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

Commit f395af59 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12460198 from bc57d803 to 25Q2-release 

Change-Id: Ib7ab1fa2cb909480f61aaf7d9e939984016ae733
parents 2db6bf41 bc57d803

ADPF_OWNERS

+3 −2
Original line number Diff line number Diff line 
lpy@google.com

mattbuckley@google.com

sumir@google.com

chingtangyu@google.com

xwxw@google.com

mattbuckley@google.com

AconfigFlags.bp

+27 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
aconfig_declarations_group {

    name: "framework-minus-apex-aconfig-declarations",

    aconfig_declarations_groups: [

        "aconfig_trade_in_mode_flags",

        "audio-framework-aconfig",

    ],

    java_aconfig_libraries: [
@@ -1643,3 +1644,29 @@ java_aconfig_library { 
    aconfig_declarations: "android.app.jank.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Trade in mode

aconfig_declarations {

    name: "aconfig_trade_in_mode_flags",

    package: "com.android.tradeinmode.flags",

    container: "system",

    srcs: [

        "core/java/android/os/image/flags/trade_in_mode_flags.aconfig",

    ],

}



java_aconfig_library {

    name: "aconfig_trade_in_mode_flags_java_lib",

    aconfig_declarations: "aconfig_trade_in_mode_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "android_trade_in_mode_flags_cc_lib",

    aconfig_declarations: "aconfig_trade_in_mode_flags",

    apex_available: [

        "//apex_available:platform",

        "com.android.adbd",

    ],

    min_sdk_version: "apex_inherit",

}

Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ filegroup { 
    srcs: [

        // Java/AIDL sources under frameworks/base

        ":framework-annotations",

        ":ravenwood-annotations",

        ":framework-blobstore-sources",

        ":framework-core-sources",

        ":framework-drm-sources",
@@ -296,7 +295,6 @@ java_defaults { 
        enforce_permissions_exceptions: [

            // Do not add entries to this list.

            ":framework-annotations",

            ":ravenwood-annotations",

            ":framework-blobstore-sources",

            ":framework-core-sources",

            ":framework-drm-sources",
@@ -370,6 +368,7 @@ java_defaults { 
    jarjar_rules: ":framework-jarjar-rules",

    javac_shard_size: 150,

    plugins: [

        "cached-property-annotation-processor",

        "view-inspector-annotation-processor",

        "staledataclass-annotation-processor",

        "error_prone_android_framework",
@@ -600,8 +599,6 @@ filegroup { 
filegroup {

    name: "framework-networkstack-shared-srcs",

    srcs: [

        // TODO: remove these annotations as soon as we can use andoid.support.annotations.*

        ":framework-annotations",

        ":modules-utils-preconditions-srcs",

        "core/java/android/util/IndentingPrintWriter.java",

        "core/java/android/util/LocalLog.java",

GAME_MANAGER_OWNERS

+2 −1
Original line number Diff line number Diff line 
lpy@google.com

sumir@google.com

chingtangyu@google.com

xwxw@google.com

mattbuckley@google.com

OWNERS

+4 −0
Original line number Diff line number Diff line
@@ -45,3 +45,7 @@ per-file PERFORMANCE_OWNERS = file:/PERFORMANCE_OWNERS 
per-file PACKAGE_MANAGER_OWNERS = file:/PACKAGE_MANAGER_OWNERS



per-file WEAR_OWNERS = file:/WEAR_OWNERS



per-file ADPF_OWNERS = file:/ADPF_OWNERS



per-file GAME_MANAGER_OWNERS = file:/GAME_MANAGER_OWNERS