Convert external/dagger2 to Android.bpandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release

See build/soong/README.md for more information.

Also rename dagger2-*-host to dagger2-* to match Soong style.

Test: m checkbuild
Change-Id: I747e15002b088583e567cf8052ecd67f70846965

2 files changed, 79 insertions, 102 deletions

diff --git a/Android.bp b/Android.bp
index c0945bbff..49e252075 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,22 +13,22 @@
 // limitations under the License.
 
 java_import_host {
-    name: "dagger2-auto-common-host",
+    name: "dagger2-auto-common",
     jars: ["lib/auto-common-1.0-20151022.071545-39.jar"],
 }
 
 java_import_host {
-    name: "dagger2-auto-factory-host",
+    name: "dagger2-auto-factory",
     jars: ["lib/auto-factory-1.0-20150915.183854-35.jar"],
 }
 
 java_import_host {
-    name: "dagger2-auto-service-host",
+    name: "dagger2-auto-service",
     jars: ["lib/auto-service-1.0-rc2.jar"],
 }
 
 java_import_host {
-    name: "dagger2-auto-value-host",
+    name: "dagger2-auto-value",
     jars: ["lib/auto-value-1.4.1.jar"],
 }
 
@@ -38,6 +38,80 @@ java_import_host {
 }
 
 java_import_host {
-    name: "dagger2-inject-host",
+    name: "dagger2-inject",
     jars: ["lib/javax-inject.jar"],
 }
+
+java_library_host {
+    name: "dagger2",
+
+    srcs: ["core/src/main/java/**/*.java"],
+
+    static_libs: ["dagger2-inject"],
+
+    libs: ["guava"],
+
+    java_version: "1.7",
+}
+
+// build dagger2 producers host jar
+// ============================================================
+
+java_library_host {
+    name: "dagger2-producers",
+
+    srcs: ["producers/src/main/java/**/*.java"],
+
+    static_libs: ["dagger2-inject"],
+
+    libs: [
+        "dagger2",
+        "guava",
+    ],
+
+    java_version: "1.7",
+}
+
+// build dagger2 compiler host jar
+// ============================================================
+
+java_library_host {
+    name: "dagger2-compiler",
+
+    // Required for use of javax.annotation.Generated per http://b/62050818
+    javacflags: ["-J--add-modules=java.xml.ws.annotation"],
+    srcs: ["compiler/src/main/java/**/*.java"],
+
+    // Manually include META-INF/services/javax.annotation.processing.Processor
+    // as the AutoService processor doesn't work properly.
+    java_resource_dirs: ["resources"],
+
+    static_libs: [
+        "dagger2",
+        "dagger2-auto-common",
+        "dagger2-auto-factory",
+        "dagger2-auto-service",
+        "dagger2-auto-value",
+        "dagger2-google-java-format",
+        "dagger2-inject",
+        "dagger2-producers",
+        "guava",
+    ],
+
+    annotation_processors: [
+        "dagger2-auto-common",
+        "dagger2-auto-factory",
+        "dagger2-auto-service",
+        "dagger2-auto-value",
+        "guava",
+    ],
+
+    annotation_processor_classes: [
+        "com.google.auto.factory.processor.AutoFactoryProcessor",
+        "com.google.auto.service.processor.AutoServiceProcessor",
+        "com.google.auto.value.processor.AutoAnnotationProcessor",
+        "com.google.auto.value.processor.AutoValueProcessor",
+    ],
+
+    java_version: "1.7",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index eebfea255..000000000
--- a/Android.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright (C) 2015 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)
-
-# build dagger2 host jar
-# ============================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := dagger2-host
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_SRC_FILES := $(call all-java-files-under, core/src/main/java/)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-  dagger2-inject-host \
-
-LOCAL_JAVA_LIBRARIES := \
-  guavalib
-
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# build dagger2 producers host jar
-# ============================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := dagger2-producers-host
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_SRC_FILES := $(call all-java-files-under, producers/src/main/java/)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-  dagger2-inject-host \
-
-LOCAL_JAVA_LIBRARIES := \
-  dagger2-host \
-  guavalib
-
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-# build dagger2 compiler host jar
-# ============================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := dagger2-compiler-host
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-# Required for use of javax.annotation.Generated per http://b/62050818
-LOCAL_JAVACFLAGS := $(if $(USE_OPENJDK9),-J--add-modules=java.xml.ws.annotation,)
-LOCAL_SRC_FILES := $(call all-java-files-under, compiler/src/main/java/)
-
-# Manually include META-INF/services/javax.annotation.processing.Processor
-# as the AutoService processor doesn't work properly.
-LOCAL_JAVA_RESOURCE_DIRS := resources
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-  dagger2-host \
-  dagger2-auto-common-host \
-  dagger2-auto-factory-host \
-  dagger2-auto-service-host \
-  dagger2-auto-value-host \
-  dagger2-google-java-format \
-  dagger2-inject-host \
-  dagger2-producers-host \
-  guavalib
-
-LOCAL_ANNOTATION_PROCESSORS := \
-  dagger2-auto-common-host \
-  dagger2-auto-factory-host \
-  dagger2-auto-service-host \
-  dagger2-auto-value-host \
-  guavalib
-
-LOCAL_ANNOTATION_PROCESSOR_CLASSES := \
-  com.google.auto.factory.processor.AutoFactoryProcessor \
-  com.google.auto.service.processor.AutoServiceProcessor \
-  com.google.auto.value.processor.AutoAnnotationProcessor \
-  com.google.auto.value.processor.AutoValueProcessor
-
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-include $(BUILD_HOST_JAVA_LIBRARY)