commit 80980574acfef74f9392da4fdbcba64d911cb66f
author Tadashi G. Takaoka <takaoka@google.com> Wed Oct 29 11:27:40 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Wed Oct 29 11:52:08 2014 +0900
tree 23681131f4b7450837ebaba98c09f48e4d572bc0
parent 48ee473c1e4d6eb1c76eeadce4a1fa3e101867a1

Fix test breakage

This CL also adds null analysis annotations to StringUtils.

Change-Id: I751932c1ed2579bc10f4584651b997356f180899

common/Android.mk

diff --git a/common/Android.mk b/common/Android.mk
index 99aed4c..085543f 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -14,8 +14,9 @@
 
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_MODULE := latinime-common
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_STATIC_JAVA_LIBRARIES := jsr305
 LOCAL_SDK_VERSION := 21
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
@@ -23,4 +24,5 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := latinime-common-host
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib
 include $(BUILD_HOST_JAVA_LIBRARY)