diff options
| author | Yohann Roussel <yroussel@google.com> | 2016-12-22 10:54:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-22 10:54:21 +0000 |
| commit | 8e58f1bef28a4de72f5f788df2b2317ede0b78d7 (patch) | |
| tree | 1e99436ef2f73dd90b45eeb461d182d52777ab22 | |
| parent | 6b14ba233962c6ddfacd8cdc32bce5a7d4dde3f2 (diff) | |
| parent | 07bca8fb7f8d97223a1c27dd5f18008f56e406af (diff) | |
| download | multidex-8e58f1bef28a4de72f5f788df2b2317ede0b78d7.tar.gz | |
Change multidex version file
am: 07bca8fb7f
Change-Id: I33264c4389947c816e20b1dfea1d65478280dcd3
| -rw-r--r-- | instrumentation/Android.mk | 12 | ||||
| -rw-r--r-- | library/Android.mk | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/instrumentation/Android.mk b/instrumentation/Android.mk index 59805be..ec50b8c 100644 --- a/instrumentation/Android.mk +++ b/instrumentation/Android.mk @@ -21,20 +21,12 @@ 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_GIT_VERSION_TAG := `cd $(LOCAL_PATH); git log --format="%H" -n 1 || (echo git hash not available; exit 0)` 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)" >> $@ + $(hide) echo "git.version=$(ASMDI_GIT_VERSION_TAG)" > $@ LOCAL_JAVA_RESOURCE_FILES := $(ASMDI_VERSION_INTERMEDIATE) diff --git a/library/Android.mk b/library/Android.mk index 3ce9c46..b38620e 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -19,20 +19,12 @@ LOCAL_MODULE := android-support-multidex LOCAL_SDK_VERSION := 4 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_GIT_VERSION_TAG := `cd $(LOCAL_PATH); git log --format="%H" -n 1 || (echo git hash not available; exit 0)` 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)" >> $@ + $(hide) echo "git.version=$(ASMD_GIT_VERSION_TAG)" > $@ LOCAL_JAVA_RESOURCE_FILES := $(ASMD_VERSION_INTERMEDIATE) |