From a2b78a7ed2c136d5cc179ba51c40906efccf72c5 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 29 Mar 2018 13:31:04 -0700 Subject: [PATCH] Add a droiddoc generator for hwbinder.stubs hwbinder.stubs provides stubs for @SystemAPI hwbinder classes that doesn't depend on framework, used to break a dependency cycle between hidl interfaces and android_system_stubs_current while satisifying the link type checks. Bug: 77285514 Test: m checkbuild Change-Id: Id4093e19f607dc5b0c663e1b637012799ab110c3 --- Android.bp | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/Android.bp b/Android.bp index 3db1cdea37f1..98e52a9e9f38 100644 --- a/Android.bp +++ b/Android.bp @@ -738,6 +738,8 @@ optional_subdirs = [ "core/tests/utiltests/jni", ] +// TODO(b/77285514): remove this once the last few hidl interfaces have been +// updated to use hwbinder.stubs. java_library { name: "hwbinder", no_framework_libs: true, @@ -958,3 +960,34 @@ droiddoc { exact_api_filename: "test-exact.txt", args: framework_docs_args + " -referenceonly -showAnnotation android.annotation.TestApi -nodocs", } + +droiddoc { + name: "hwbinder-stubs-docs", + srcs: [ + "core/java/android/os/HidlSupport.java", + "core/java/android/annotation/IntDef.java", + "core/java/android/annotation/NonNull.java", + "core/java/android/annotation/SystemApi.java", + "core/java/android/os/HwBinder.java", + "core/java/android/os/HwBlob.java", + "core/java/android/os/HwParcel.java", + "core/java/android/os/IHwBinder.java", + "core/java/android/os/IHwInterface.java", + "core/java/android/os/DeadObjectException.java", + "core/java/android/os/DeadSystemException.java", + "core/java/android/os/RemoteException.java", + "core/java/android/util/AndroidException.java", + ], + custom_template: "droiddoc-templates-sdk", + installable: false, + no_framework_libs: true, + args: "-showAnnotation android.annotation.SystemApi -nodocs -stubsourceonly", +} + +java_library_static { + name: "hwbinder.stubs", + sdk_version: "core_current", + srcs: [ + ":hwbinder-stubs-docs", + ], +} -- 2.11.0