diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-02-20 13:11:27 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-02-21 10:29:12 -0800 |
| commit | cfa38226ad6e198a63af6d4bfacbe5e1db39eb48 (patch) | |
| tree | d6e11a3aea79094f774ec11b2b6b8e899e6f0614 /brillo_config | |
| parent | dc282ead05da82a1851d2bcb2ecfd0ec44e35c10 (diff) | |
| download | extras-cfa38226ad6e198a63af6d4bfacbe5e1db39eb48.tar.gz | |
Use HAS_BUILD_NUMBER to check engineering build
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build
reruns.
Test: m -j32
Bug: b/70351683
Change-Id: Ic2a6e2095712828c8314fdd5fca7669f2fb88bc3
Diffstat (limited to 'brillo_config')
| -rw-r--r-- | brillo_config/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/brillo_config/Android.mk b/brillo_config/Android.mk index 61ec0cc7..c132f195 100644 --- a/brillo_config/Android.mk +++ b/brillo_config/Android.mk @@ -81,8 +81,8 @@ endif # 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_SYSTEM_VERSION).$(BUILD_NUMBER) > $@ +ifeq ($(strip $(HAS_BUILD_NUMBER)),true) + echo $(BRILLO_SYSTEM_VERSION).$(file <$(BUILD_NUMBER_FILE)) > $@ else echo $(BRILLO_SYSTEM_VERSION).$(BUILD_DATETIME_FROM_FILE) > $@ endif |