diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-10-08 10:27:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-08 10:27:11 +0000 |
| commit | 4b350ecffec49af1ea0658d5f5afc7c402d0e801 (patch) | |
| tree | b3f81f44fae609e50c9eabe2ec5a2879328d9b62 | |
| parent | bc56ecba9a7436ec2db6e4998547c78045ed6d16 (diff) | |
| parent | 6d70d23facddf0e780cfb08a7f9af94da510bf96 (diff) | |
| download | multidex-4b350ecffec49af1ea0658d5f5afc7c402d0e801.tar.gz | |
am 6d70d23f: Keep track of the version.
* commit '6d70d23facddf0e780cfb08a7f9af94da510bf96':
Keep track of the version.
| -rw-r--r-- | instrumentation/Android.mk | 20 | ||||
| -rw-r--r-- | library/Android.mk | 18 |
2 files changed, 38 insertions, 0 deletions
diff --git a/instrumentation/Android.mk b/instrumentation/Android.mk index dce8f93..59805be 100644 --- a/instrumentation/Android.mk +++ b/instrumentation/Android.mk @@ -19,4 +19,24 @@ LOCAL_MODULE := android-support-multidex-instrumentation LOCAL_JAVA_LIBRARIES := android-support-multidex LOCAL_SDK_VERSION := 4 LOCAL_SRC_FILES := $(call all-java-files-under, src) + + +ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" + ASMDI_VERSION_NAME_TAG := eng.$(USER) +else + ASMDI_VERSION_NAME_TAG := $(BUILD_NUMBER) +endif + +ASMDI_GIT_VERSION_TAG := `cd $(LOCAL_PATH); git log --format="%H" -n 1` + +ASMDI_VERSION_INTERMEDIATE = $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/$(LOCAL_MODULE).version.txt +$(ASMDI_VERSION_INTERMEDIATE): + $(hide) mkdir -p $(dir $@) + $(hide) echo "build.version=$(ASMDI_VERSION_NAME_TAG)" > $@ + $(hide) echo "build.id=$(BUILD_ID)" >> $@ + $(hide) echo "git.version=$(ASMDI_GIT_VERSION_TAG)" >> $@ + +LOCAL_JAVA_RESOURCE_FILES := $(ASMDI_VERSION_INTERMEDIATE) + + include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/library/Android.mk b/library/Android.mk index 40a3f68..7d5cbb7 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -18,4 +18,22 @@ include $(CLEAR_VARS) LOCAL_MODULE := android-support-multidex LOCAL_SDK_VERSION := 11 LOCAL_SRC_FILES := $(call all-java-files-under, src) + +ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" + ASMD_VERSION_NAME_TAG := eng.$(USER) +else + ASMD_VERSION_NAME_TAG := $(BUILD_NUMBER) +endif + +ASMD_GIT_VERSION_TAG := `cd $(LOCAL_PATH); git log --format="%H" -n 1` + +ASMD_VERSION_INTERMEDIATE = $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/$(LOCAL_MODULE).version.txt +$(ASMD_VERSION_INTERMEDIATE): + $(hide) mkdir -p $(dir $@) + $(hide) echo "build.version=$(ASMD_VERSION_NAME_TAG)" > $@ + $(hide) echo "build.id=$(BUILD_ID)" >> $@ + $(hide) echo "git.version=$(ASMD_GIT_VERSION_TAG)" >> $@ + +LOCAL_JAVA_RESOURCE_FILES := $(ASMD_VERSION_INTERMEDIATE) + include $(BUILD_STATIC_JAVA_LIBRARY) |