Merge "Convert javadoc to Soong for device/sample"
diff --git a/frameworks/PlatformLibrary/Android.bp b/frameworks/PlatformLibrary/Android.bp
new file mode 100644
index 0000000..875b598
--- /dev/null
+++ b/frameworks/PlatformLibrary/Android.bp
@@ -0,0 +1,20 @@
+// Copyright (C) 2008 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+javadoc {
+    name: "platform_library-docs",
+    srcs: [
+        "java/**/*.java",
+    ],
+}
diff --git a/frameworks/PlatformLibrary/Android.mk b/frameworks/PlatformLibrary/Android.mk
index f34a5ef..d4250af 100644
--- a/frameworks/PlatformLibrary/Android.mk
+++ b/frameworks/PlatformLibrary/Android.mk
@@ -37,19 +37,6 @@
 
 include $(BUILD_JAVA_LIBRARY)
 
-# the documentation
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files) $(call all-subdir-html-files)
-
-LOCAL_MODULE:= platform_library
-LOCAL_DROIDDOC_OPTIONS :=
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_DROIDDOC_USE_STANDARD_DOCLET := true
-
-include $(BUILD_DROIDDOC)
-
 # The JNI component
 # ============================================================
 # Also build all of the sub-targets under this one: the library's