diff options
| author | Colin Cross <ccross@android.com> | 2017-09-05 17:10:54 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-09-11 13:05:44 -0700 |
| commit | 30909f76ef2849d6e048344b5f57588139acb181 (patch) | |
| tree | 2d5a9416ddc2137dbbd9f58ed23b23a34297b2da /Android.mk | |
| parent | 4adf2d360d1a32a1e053cd181fcbc45ca7a0bd2a (diff) | |
| download | dagger2-30909f76ef2849d6e048344b5f57588139acb181.tar.gz | |
Move host dependencies to Android.bp
Also move dagger2-inject-host to a static dependency, all users of
dagger2-host include dagger2-inject-host statically, and depending
on as non-static library causes it to be installed unnecessarily.
See build/soong/README.md for more information.
The libraries in lib/ are used outside the project by host tools
that are prerequisites for converting device modules to soong.
Test: m -j checkbuild
Change-Id: I3f8164c3a67b37f88fca888cabac290d2c927d1e
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 22 |
1 files changed, 6 insertions, 16 deletions
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) |