OSDN Git Service

Fix checkapi for OpenJDK 9 builds
authorNeil Fuller <nfuller@google.com>
Fri, 24 Nov 2017 15:58:38 +0000 (15:58 +0000)
committerNeil Fuller <nfuller@google.com>
Fri, 24 Nov 2017 16:27:10 +0000 (16:27 +0000)
This change explitly hides com.android.okhttp
from doclava. The public.txt generation was
previously relying on a package.html in
com.android to hide all subpackages, which
doesn't work with javadoc 9.

Test: make droid (with both OpenJDK 8 and OpenJDK 9)
Bug: 69709687
Change-Id: If61b69f913be044adb4cd34867459bde6330ea2c

Android.mk
core/java/com/android/package.html [deleted file]

index f4a9ff9..b3db409 100644 (file)
@@ -1027,6 +1027,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
     -knowntags ./frameworks/base/docs/knowntags.txt \
     -knowntags ./libcore/known_oj_tags.txt \
     -manifest ./frameworks/base/core/res/AndroidManifest.xml \
+    -hidePackage com.android.okhttp \
     -hidePackage com.android.org.conscrypt \
     -since $(SRC_API_DIR)/1.xml 1 \
     -since $(SRC_API_DIR)/2.xml 2 \
diff --git a/core/java/com/android/package.html b/core/java/com/android/package.html
deleted file mode 100644 (file)
index db6f78b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-{@hide}
-</body>
\ No newline at end of file