Merge "Convert doclava to Soong for Droiddoc" am: a54d47755b am: d0b671a4fd

am: 9ffd4ee933

Change-Id: I91cd60b756214b59e3306f6e6003c9b5cd5cd6cf

2 files changed, 32 insertions, 41 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..18104ff
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,32 @@
+// Copyright (C) 2018 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.
+
+java_library_host {
+    name: "doclava",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "jsilver",
+        "guavalib",
+        "antlr-runtime",
+        "tagsoup",
+    ],
+    use_tools_jar: true,
+    java_resource_dirs: ["res"],
+}
+
+// TODO: add a test target.
+// For now, you can run the unit tests thus:
+// vogar --classpath /usr/lib/jvm/java-6-sun/lib/tools.jar --classpath ../../out/host/common/obj/JAVA_LIBRARIES/antlr_intermediates/javalib.jar --sourcepath src/ --sourcepath ../jsilver/src/ --mode jvm test/doclava/ApiCheckTest.java
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index ed9eb8c..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) 2010 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.
-
-LOCAL_PATH := $(call my-dir)
-
-# Jar file for Doclava doclet and apicheck standalone program
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := \
-	jsilver \
-	guavalib \
-	antlr-runtime
-
-LOCAL_STATIC_JAVA_LIBRARIES += tagsoup
-
-LOCAL_CLASSPATH := \
-	$(HOST_JDK_TOOLS_JAR)
-
-LOCAL_MODULE := doclava
-
-LOCAL_JAVA_RESOURCE_DIRS := res
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# TODO: add a test target.
-# For now, you can run the unit tests thus:
-# vogar --classpath /usr/lib/jvm/java-6-sun/lib/tools.jar --classpath ../../out/host/common/obj/JAVA_LIBRARIES/antlr_intermediates/javalib.jar --sourcepath src/ --sourcepath ../jsilver/src/ --mode jvm test/doclava/ApiCheckTest.java