diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 46 |
1 files changed, 34 insertions, 12 deletions
diff --git a/Android.bp b/Android.bp index 028e8a45fd03..158644096a0d 100644 --- a/Android.bp +++ b/Android.bp @@ -801,6 +801,40 @@ java_library_host { }, } +// ==== java proto device library (for test only) ============================== +java_library { + name: "platformprotosnano", + proto: { + type: "nano", + output_params: ["store_unknown_fields=true"], + include_dirs: ["external/protobuf/src"], + }, + + sdk_version: "current", + srcs: [ + "core/proto/**/*.proto", + "libs/incident/proto/android/os/**/*.proto", + ], +} + +// ==== java proto device library (for test only) ============================== +java_library { + name: "platformprotoslite", + proto: { + type: "lite", + include_dirs: ["external/protobuf/src"], + }, + + srcs: [ + "core/proto/**/*.proto", + "libs/incident/proto/android/os/**/*.proto", + ], + // Protos have lots of MissingOverride and similar. + errorprone: { + javacflags: ["-XepDisableAllChecks"], + }, +} + // ==== c++ proto device library ============================== cc_library { name: "libplatformprotos", @@ -1022,10 +1056,6 @@ doc_defaults { ":openjdk_javadoc_files", ":non_openjdk_javadoc_files", ":android_icu4j_src_files_for_docs", - ":gen-ojluni-jaif-annotated-srcs", - ], - exclude_srcs: [ - ":annotated_ojluni_files", ], srcs_lib: "framework", srcs_lib_whitelist_dirs: frameworks_base_subdirs, @@ -1072,13 +1102,9 @@ doc_defaults { ":openjdk_javadoc_files", ":non_openjdk_javadoc_files", ":android_icu4j_src_files_for_docs", - ":gen-ojluni-jaif-annotated-srcs", "test-mock/src/**/*.java", "test-runner/src/**/*.java", ], - exclude_srcs: [ - ":annotated_ojluni_files", - ], srcs_lib: "framework", srcs_lib_whitelist_dirs: frameworks_base_subdirs, srcs_lib_whitelist_pkgs: packages_to_document, @@ -1457,10 +1483,6 @@ doc_defaults { ":openjdk_javadoc_files", ":non_openjdk_javadoc_files", ":android_icu4j_src_files_for_docs", - ":gen-ojluni-jaif-annotated-srcs", - ], - exclude_srcs: [ - ":annotated_ojluni_files", ], srcs_lib: "framework", srcs_lib_whitelist_dirs: frameworks_base_subdirs, |