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

Commit 1a9aef8f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move a11ychecker sources to an isolated dependency" into main

parents 2a5a9752 6dae8db4

services/accessibility/Android.bp

+1 −12
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ package { 
filegroup {

    name: "services.accessibility-sources",

    srcs: ["java/**/*.java"],

    exclude_srcs: ["java/**/a11ychecker/*.java"],

    path: "java",

    visibility: ["//frameworks/base/services"],

}
@@ -26,16 +27,13 @@ java_library_static { 
    },

    srcs: [

        ":services.accessibility-sources",

        ":statslog-accessibility-java-gen",

        "//frameworks/base/packages/SettingsLib/RestrictedLockUtils:SettingsLibRestrictedLockUtilsSrc",

    ],

    libs: [

        "aatf",

        "services.core",

        "androidx.annotation_annotation",

    ],

    static_libs: [

        "accessibility_protos_lite",

        "com_android_server_accessibility_flags_lib",

        "//frameworks/base/packages/SystemUI/aconfig:com_android_systemui_flags_lib",

    ],
@@ -70,12 +68,3 @@ java_aconfig_library { 
    name: "com_android_server_accessibility_flags_lib",

    aconfig_declarations: "com_android_server_accessibility_flags",

}
 


genrule {

    name: "statslog-accessibility-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module accessibility" +

        " --javaPackage com.android.server.accessibility.a11ychecker" +

        " --javaClass AccessibilityCheckerStatsLog --minApiLevel 34",

    out: ["java/com/android/server/accessibility/a11ychecker/AccessibilityCheckerStatsLog.java"],

}

services/accessibility/java/com/android/server/accessibility/a11ychecker/Android.bp

0 → 100644
+31 −0
Original line number Diff line number Diff line 
package {

    default_applicable_licenses: ["frameworks_base_license"],

}



// TODO(http://b/364326163): a11ychecker depends on aatf which currently can't be used in the system

// server as it pulls in test deps. We moved a11ychecker sources from services.accessibility to an

// isolated library while this is resolved.

java_library_static {

    name: "a11ychecker",

    srcs: [

        "*.java",

        ":statslog-accessibility-java-gen",

    ],

    libs: [

        "aatf",

        "androidx.annotation_annotation",

    ],

    static_libs: [

        "accessibility_protos_lite",

        "com_android_server_accessibility_flags_lib",

    ],

}



genrule {

    name: "statslog-accessibility-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module accessibility" +

        " --javaPackage com.android.server.accessibility.a11ychecker" +

        " --javaClass AccessibilityCheckerStatsLog --minApiLevel 34",

    out: ["java/com/android/server/accessibility/a11ychecker/AccessibilityCheckerStatsLog.java"],

}

services/tests/servicestests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ android_test { 
        "-Werror",

    ],

    static_libs: [

        "a11ychecker",

        "aatf",

        "accessibility_protos_lite",

        "cts-input-lib",