diff options
| author | Bertrand SIMONNET <bsimonnet@google.com> | 2015-10-28 21:42:56 -0700 |
|---|---|---|
| committer | Bertrand SIMONNET <bsimonnet@google.com> | 2015-10-30 11:25:36 -0700 |
| commit | 5f78882ccd104a07fc95c486c3bb57e6483f8262 (patch) | |
| tree | 7f05760859cb4a633efd27cc715c1694b9902c37 /brillo_config | |
| parent | 4ea2a41464237deabff29bd29a9ffb621ac9f7af (diff) | |
| download | extras-5f78882ccd104a07fc95c486c3bb57e6483f8262.tar.gz | |
brillo_config: Don't cache the timestamp.
We want the timestamp to change at every build as we may be using the
resulting image to generate an update and we need different images to
have different versions.
Bug: 25358721
Change-Id: I9ae0ae0ba34ea0f508fc3a5f051368e4bce57b61
Test: Build twice in a row, the timestamp is updated.
Diffstat (limited to 'brillo_config')
| -rw-r--r-- | brillo_config/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/brillo_config/Android.mk b/brillo_config/Android.mk index 68032f19..09f6f7de 100644 --- a/brillo_config/Android.mk +++ b/brillo_config/Android.mk @@ -46,13 +46,16 @@ $(error Invalid BRILLO_PRODUCT_VERSION "$(BRILLO_PRODUCT_VERSION)", must be \ endif # Append BUILD_NUMBER if it is a number or a build timestamp otherwise. -# Use DATE to generate the timestamp based on BUILD_DATETIME. +# 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): $(hide)mkdir -p $(dir $@) ifeq ($(shell echo $(BUILD_NUMBER) | grep -E '[^0-9]'),) echo $(BRILLO_PRODUCT_VERSION).$(BUILD_NUMBER) > $@ else - echo $(BRILLO_PRODUCT_VERSION).$(BUILD_DATETIME_FROM_FILE) > $@ + echo $(BRILLO_PRODUCT_VERSION).$(BUILD_DATETIME) > $@ endif endif |