diff options
| author | Jean-Philippe Lesot <jplesot@google.com> | 2014-11-03 15:08:22 +0100 |
|---|---|---|
| committer | Jean-Philippe Lesot <jplesot@google.com> | 2014-11-05 19:32:48 +0100 |
| commit | ea0fa945915b657a93f8fca51789fd307d475a7c (patch) | |
| tree | bde1a8c81acb8b035707c29cbf3a9bd0b4d2927e /jack/Android.mk | |
| parent | 80cb6486e415ff0749a767aeb580965ef997cd11 (diff) | |
| download | toolchain_jack-ea0fa945915b657a93f8fca51789fd307d475a7c.zip toolchain_jack-ea0fa945915b657a93f8fca51789fd307d475a7c.tar.gz toolchain_jack-ea0fa945915b657a93f8fca51789fd307d475a7c.tar.bz2 | |
Rework version management
Bug: 108682
Change-Id: Iec7b18b6f5ac2ff3ce748e4280a2e0cb48def0ed
Diffstat (limited to 'jack/Android.mk')
| -rw-r--r-- | jack/Android.mk | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/jack/Android.mk b/jack/Android.mk index 7ec4a77..edeb341 100644 --- a/jack/Android.mk +++ b/jack/Android.mk @@ -26,9 +26,6 @@ endef include $(CLEAR_VARS) -JACK_BASE_VERSION_NAME := 1.0 -JACK_BASE_VERSION_CODE := 001 - LOCAL_MODULE := jack LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := EXECUTABLES @@ -90,21 +87,6 @@ LOCAL_JAVA_LIBRARIES := \ allocation-jack \ $(JACK_STATIC_JAVA_LIBRARIES) -ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" - JACK_VERSION_NAME_TAG := eng.$(USER) -else - JACK_VERSION_NAME_TAG := $(BUILD_NUMBER) -endif - -JACK_VERSION_NAME := "$(JACK_BASE_VERSION_NAME).$(JACK_BASE_VERSION_CODE).$(JACK_VERSION_NAME_TAG)" - -intermediates := $(call local-intermediates-dir,COMMON) -$(intermediates)/rsc/jack.properties: $(LOCAL_PATH)/Android.mk - $(hide) mkdir -p $(dir $@) - $(hide) echo "jack.version=$(JACK_VERSION_NAME)" > $@ - -LOCAL_JAVA_RESOURCE_FILES := $(intermediates)/rsc/jack.properties - include $(BUILD_HOST_JAVA_LIBRARY) # overwrite install rule, using LOCAL_POST_INSTALL_CMD may cause the installed jar to be used before the post install command is completed |