From 57157fb310d5671e660e30d9c9b7974242f86755 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 24 Nov 2017 15:58:38 +0000 Subject: [PATCH] Fix checkapi for OpenJDK 9 builds 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 | 1 + core/java/com/android/package.html | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 core/java/com/android/package.html diff --git a/Android.mk b/Android.mk index f4a9ff957595..b3db4097f240 100644 --- a/Android.mk +++ b/Android.mk @@ -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 index db6f78bbf628..000000000000 --- a/core/java/com/android/package.html +++ /dev/null @@ -1,3 +0,0 @@ - -{@hide} - \ No newline at end of file -- 2.11.0