diff options
| -rw-r--r-- | services/accessibility/Android.bp | 13 | ||||
| -rw-r--r-- | services/accessibility/java/com/android/server/accessibility/a11ychecker/Android.bp | 31 | ||||
| -rw-r--r-- | services/tests/servicestests/Android.bp | 1 |
3 files changed, 33 insertions, 12 deletions
diff --git a/services/accessibility/Android.bp b/services/accessibility/Android.bp index 3d7ad0b94d1b..b97ff6217403 100644 --- a/services/accessibility/Android.bp +++ b/services/accessibility/Android.bp @@ -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"], -} diff --git a/services/accessibility/java/com/android/server/accessibility/a11ychecker/Android.bp b/services/accessibility/java/com/android/server/accessibility/a11ychecker/Android.bp new file mode 100644 index 000000000000..e9ed202f3a49 --- /dev/null +++ b/services/accessibility/java/com/android/server/accessibility/a11ychecker/Android.bp @@ -0,0 +1,31 @@ +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"], +} diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 09f81f736b36..3a7d206840a6 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -36,6 +36,7 @@ android_test { "-Werror", ], static_libs: [ + "a11ychecker", "aatf", "accessibility_protos_lite", "cts-input-lib", |