diff options
author | Narayan Kamath <narayan@google.com> | 2015-12-24 11:56:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-24 11:56:44 +0000 |
commit | 7de829dfae22e9be8aa973a721d59c48d7f6fe7d (patch) | |
tree | 29bef7c7ee1b4f302dc86d26dabcf37776987c22 | |
parent | 6c9ca4c4097e6f6e1296fafb8dcc5fc66a2f21cc (diff) | |
parent | 043f7bcd8cf64b9833e9ee4120bad4452948b8ce (diff) | |
download | mockwebserver-7de829dfae22e9be8aa973a721d59c48d7f6fe7d.tar.gz |
Merge "Add core-oj to the list of core library jars."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-4android-n-preview-3android-n-preview-2android-n-preview-1
-rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -21,7 +21,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(mockwebserver_src_files) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := mockwebserver -LOCAL_JAVA_LIBRARIES := core-libart +LOCAL_JAVA_LIBRARIES := core-oj core-libart LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) |