diff options
| author | Bertrand Simonnet <bsimonnet@google.com> | 2015-10-30 18:29:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-30 18:29:10 +0000 |
| commit | 63b10569b9cda3303bad274fee5126f4e8b3a386 (patch) | |
| tree | 5089b7c2767ea5af2aa7c714033b682cb40d12a1 | |
| parent | a17cfd8b6dfc820fd6ae88e0097387dc4a442235 (diff) | |
| parent | 5f78882ccd104a07fc95c486c3bb57e6483f8262 (diff) | |
| download | extras-63b10569b9cda3303bad274fee5126f4e8b3a386.tar.gz | |
Merge "brillo_config: Don't cache the timestamp."
| -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 |