diff options
| author | Jean-Philippe Lesot <jplesot@google.com> | 2015-04-15 17:09:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-15 17:09:54 +0000 |
| commit | a2d1074695015c0d0f0e541dbfb4ce1cf2f14dc5 (patch) | |
| tree | 0bdf25f7196e4d66c7b71420111897860bbd1097 | |
| parent | 5b053437fe4f9d6d56befeb524b3772e48e6f3af (diff) | |
| parent | 7d7732a2e6bea906a35cca5c5a4801928d4181ad (diff) | |
| download | toolchain_jack-a2d1074695015c0d0f0e541dbfb4ce1cf2f14dc5.zip toolchain_jack-a2d1074695015c0d0f0e541dbfb4ce1cf2f14dc5.tar.gz toolchain_jack-a2d1074695015c0d0f0e541dbfb4ce1cf2f14dc5.tar.bz2 | |
Merge "Kill jack server before installing jack.jar" into ub-jack
| -rw-r--r-- | jack/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/jack/Android.mk b/jack/Android.mk index e0f87cb..6b1d7de 100644 --- a/jack/Android.mk +++ b/jack/Android.mk @@ -174,8 +174,10 @@ LOCAL_MODULE := jack LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := \ jack-server +LOCAL_ADDITIONAL_DEPENDENCIES := $(jack_admin_script) include $(BUILD_HOST_JAVA_LIBRARY) $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) + $(hide) $(jack_admin_script) kill-server || echo $(hide) rm -rf $<.tmp $(hide) mkdir -p $<.tmp $(hide) unzip -qd $<.tmp $< |