Change multidex version file
- Stop collecting build id and version to allow better behavior with
incremental builds.
- Make it resistant to git errors.
Test: mm
Change-Id: I03b1e36048f92f50227cfc0e370454438bee31cf
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_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)