Move host dependencies to Android.bp am: 30909f76ef am: e5d08c4044

am: 3c82d62563

Change-Id: Id2b2cac58be25a53a22c866bea7e813c5b2a7263

2 files changed, 49 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 000000000..c0945bbff
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,43 @@
+// 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.
+
+java_import_host {
+    name: "dagger2-auto-common-host",
+    jars: ["lib/auto-common-1.0-20151022.071545-39.jar"],
+}
+
+java_import_host {
+    name: "dagger2-auto-factory-host",
+    jars: ["lib/auto-factory-1.0-20150915.183854-35.jar"],
+}
+
+java_import_host {
+    name: "dagger2-auto-service-host",
+    jars: ["lib/auto-service-1.0-rc2.jar"],
+}
+
+java_import_host {
+    name: "dagger2-auto-value-host",
+    jars: ["lib/auto-value-1.4.1.jar"],
+}
+
+java_import_host {
+    name: "dagger2-google-java-format",
+    jars: ["lib/google-java-format-0.1-20151017.042846-2.jar"],
+}
+
+java_import_host {
+    name: "dagger2-inject-host",
+    jars: ["lib/javax-inject.jar"],
+}
diff --git a/Android.mk b/Android.mk
index 64318d7cd..b648ca7cc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,8 +24,10 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_SRC_FILES := $(call all-java-files-under, core/src/main/java/)
 
-LOCAL_JAVA_LIBRARIES := \
+LOCAL_STATIC_JAVA_LIBRARIES := \
   dagger2-inject-host \
+
+LOCAL_JAVA_LIBRARIES := \
   guavalib
 
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
@@ -41,9 +43,11 @@ 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 \
-  dagger2-inject-host \
   guavalib
 
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
@@ -91,17 +95,3 @@ LOCAL_ANNOTATION_PROCESSOR_CLASSES := \
 
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 include $(BUILD_HOST_JAVA_LIBRARY)
-
-# Build host dependencies.
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_JAVA_LIBRARIES := \
-    dagger2-auto-common-host:lib/auto-common-1.0-20151022.071545-39$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    dagger2-auto-factory-host:lib/auto-factory-1.0-20150915.183854-35$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    dagger2-auto-service-host:lib/auto-service-1.0-rc2$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    dagger2-auto-value-host:lib/auto-value-1.4.1$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    dagger2-google-java-format:lib/google-java-format-0.1-20151017.042846-2$(COMMON_JAVA_PACKAGE_SUFFIX) \
-    dagger2-inject-host:lib/javax-inject$(COMMON_JAVA_PACKAGE_SUFFIX)
-
-include $(BUILD_HOST_PREBUILT)