diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-15 22:30:49 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-15 22:30:49 +0000 |
commit | dc282ead05da82a1851d2bcb2ecfd0ec44e35c10 (patch) | |
tree | aeec808650f88af078069c8ae7c924309858d406 | |
parent | 01b1cb727c240a0ed5ab48ed7021cc3fa5d46a1c (diff) | |
parent | 37eb91d88c9f9bdc1eda7d8de5d80c1d5f18a1d1 (diff) | |
download | extras-dc282ead05da82a1851d2bcb2ecfd0ec44e35c10.tar.gz |
Merge "Use BUILD_DATETIME_FROM_FILE instead of BUILD_DATETIME in brillo_config"
-rw-r--r-- | brillo_config/Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/brillo_config/Android.mk b/brillo_config/Android.mk index 3eba5a91..61ec0cc7 100644 --- a/brillo_config/Android.mk +++ b/brillo_config/Android.mk @@ -77,8 +77,6 @@ $(error Invalid BRILLO_SYSTEM_VERSION "$(BRILLO_SYSTEM_VERSION)", must be \ endif # Append BUILD_NUMBER if it is a number or a build timestamp otherwise. -# We don't want to use BUILD_DATETIME_FROM_FILE as this timestamp must be -# different at every build. # If you don' want this to change at every build, you can define BUILD_NUMBER in # your product makefile and increase it manually. $(LOCAL_BUILT_MODULE): @@ -86,7 +84,7 @@ $(LOCAL_BUILT_MODULE): ifeq ($(shell echo $(BUILD_NUMBER) | grep -E '[^0-9]'),) echo $(BRILLO_SYSTEM_VERSION).$(BUILD_NUMBER) > $@ else - echo $(BRILLO_SYSTEM_VERSION).$(BUILD_DATETIME) > $@ + echo $(BRILLO_SYSTEM_VERSION).$(BUILD_DATETIME_FROM_FILE) > $@ endif endif |