diff options
| author | Colin Cross <ccross@android.com> | 2017-01-20 16:33:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-20 16:33:08 +0000 |
| commit | b6c2a9cbfc282721643e7bae4b6c42808d6ed81c (patch) | |
| tree | 1d9008a885922d17215955146345c2c5d256f050 | |
| parent | da6dc2f68ad8b8e94d666d87b30b1ddda0c4f43c (diff) | |
| parent | 6e08bec8ab939019f760dcc859330d33255167e0 (diff) | |
| download | guava-b6c2a9cbfc282721643e7bae4b6c42808d6ed81c.tar.gz | |
Merge "Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guava-hostdex" am: ebb96ab162 am: 2bb56c696bandroid-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-n-iot-preview-4n-iot-preview-4
am: 6e08bec8ab
Change-Id: I439a1883a5ffda95c76d19907941f062edcc084d
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index b45f64a2b..40071503e 100644 --- a/Android.mk +++ b/Android.mk @@ -40,4 +40,4 @@ LOCAL_SRC_FILES := $(call all-java-files-under, guava/src) LOCAL_MODULE := guava-hostdex LOCAL_STATIC_JAVA_LIBRARIES := jsr305-hostdex -include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) +include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) |