diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-03-27 18:41:36 +0100 |
|---|---|---|
| committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-03-30 15:36:18 +0200 |
| commit | 00d8ad6749739964c35f37740fc87bb05afc47ae (patch) | |
| tree | 8cbbed83972f90ed17ed10df096dd38d01759914 /jack/Android.mk | |
| parent | 091516b153ad020a1b92afa33ae417598e78c3e6 (diff) | |
| download | toolchain_jack-00d8ad6749739964c35f37740fc87bb05afc47ae.zip toolchain_jack-00d8ad6749739964c35f37740fc87bb05afc47ae.tar.gz toolchain_jack-00d8ad6749739964c35f37740fc87bb05afc47ae.tar.bz2 | |
Split Jack server as a separate project
Change-Id: I1b593fda9ba89298d8729684778f8992689d8b32
Diffstat (limited to 'jack/Android.mk')
| -rw-r--r-- | jack/Android.mk | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/jack/Android.mk b/jack/Android.mk index f48e57d..363c246 100644 --- a/jack/Android.mk +++ b/jack/Android.mk @@ -44,7 +44,7 @@ endef include $(CLEAR_VARS) -LOCAL_MODULE := jack +LOCAL_MODULE := jack-no-server LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := EXECUTABLES @@ -90,7 +90,6 @@ LOCAL_JAVACFLAGS := -processor com.android.sched.build.SchedAnnotationProcessor JACK_STATIC_JAVA_LIBRARIES := \ ecj-jack \ - simple-jack \ guava-jack \ jsr305lib-jack \ dx-jack \ @@ -109,7 +108,7 @@ LOCAL_JAVA_LIBRARIES := \ include $(BUILD_HOST_JAVA_LIBRARY) $(LOCAL_INSTALLED_MODULE) : $(jack_script) - +INSTALLED_JACK_NOSERVER := $(LOCAL_INSTALLED_MODULE) JACK_JAR_INTERMEDIATE:=$(LOCAL_BUILT_MODULE).intermediate.jar $(JACK_JAR_INTERMEDIATE): $(LOCAL_BUILT_MODULE) java -jar $(call java-lib-libs,sched-build,true) $< $(call java-lib-libs,$(JACK_STATIC_JAVA_LIBRARIES),true) $@ @@ -145,13 +144,29 @@ $(LOCAL_INSTALLED_MODULE): PRIVATE_JAR_MANIFEST := $(LOCAL_PATH)/$(LOCAL_JAR_MAN $(LOCAL_INSTALLED_MODULE): $(JACK_JAR_INTERMEDIATE) $(JACK_DEFAULT_LIB) $(hide) rm -rf $<.tmp $(hide) mkdir -p $<.tmp/jack-default-lib - $(hide) unzip -d $<.tmp $< - $(hide) unzip -d $<.tmp/jack-default-lib $(JACK_DEFAULT_LIB) + $(hide) unzip -qd $<.tmp $< + $(hide) unzip -qd $<.tmp/jack-default-lib $(JACK_DEFAULT_LIB) $(hide) jar -cfm $@ $(PRIVATE_JAR_MANIFEST) -C $<.tmp . # Merge with sched lib support $(LOCAL_BUILT_MODULE): $(call java-lib-libs,sched-build,true) + +include $(CLEAR_VARS) + +LOCAL_MODULE := jack +LOCAL_MODULE_TAGS := optional +LOCAL_STATIC_JAVA_LIBRARIES := \ + jack-server +include $(BUILD_HOST_JAVA_LIBRARY) +$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) + $(hide) rm -rf $<.tmp + $(hide) mkdir -p $<.tmp + $(hide) unzip -qd $<.tmp $< + $(hide) unzip -oqd $<.tmp $(INSTALLED_JACK_NOSERVER) + $(hide) jar -cf $@ -C $<.tmp . + + # Include this library in the build server's output directory $(call dist-for-goals, dist_files, $(LOCAL_BUILT_MODULE):jack.jar) |