diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-02-28 20:15:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-28 20:15:52 +0000 |
| commit | 47b08fbab5fb76037a8f8eb4f96284b69f598e12 (patch) | |
| tree | b997908adecd5508e9a44028bb4b166bda79c82e | |
| parent | cabdab0a40609023cc566b065a8d76a8bcb87c7e (diff) | |
| parent | d68a88402f07d6e3e8f24a4b644c1622db77451e (diff) | |
| download | build-47b08fbab5fb76037a8f8eb4f96284b69f598e12.tar.gz | |
Merge "Move build number file to out/soong"
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | core/main.mk | 8 | ||||
| -rw-r--r-- | core/soong_config.mk | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/core/config.mk b/core/config.mk index 844d7d68b4..ba77990da0 100644 --- a/core/config.mk +++ b/core/config.mk @@ -820,7 +820,7 @@ else MAINLINE_SEPOLICY_DEV_CERTIFICATES := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE)) endif -BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt) +BUILD_NUMBER_FROM_FILE := $$(cat $(SOONG_OUT_DIR)/build_number.txt) BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) # SEPolicy versions diff --git a/core/main.mk b/core/main.mk index 34d185a9e0..dc8080ddad 100644 --- a/core/main.mk +++ b/core/main.mk @@ -38,11 +38,13 @@ include $(BUILD_SYSTEM)/clang/config.mk # Write the build number to a file so it can be read back in # without changing the command line every time. Avoids rebuilds # when using ninja. -$(shell mkdir -p $(OUT_DIR) && \ - echo -n $(BUILD_NUMBER) > $(OUT_DIR)/build_number.txt) -BUILD_NUMBER_FILE := $(OUT_DIR)/build_number.txt +$(shell mkdir -p $(SOONG_OUT_DIR) && \ + echo -n $(BUILD_NUMBER) > $(SOONG_OUT_DIR)/build_number.txt) +BUILD_NUMBER_FILE := $(SOONG_OUT_DIR)/build_number.txt .KATI_READONLY := BUILD_NUMBER_FILE $(KATI_obsolete_var BUILD_NUMBER,See https://android.googlesource.com/platform/build/+/master/Changes.md#BUILD_NUMBER) +$(BUILD_NUMBER_FILE): + touch $@ DATE_FROM_FILE := date -d @$(BUILD_DATETIME_FROM_FILE) .KATI_READONLY := DATE_FROM_FILE diff --git a/core/soong_config.mk b/core/soong_config.mk index f31c9a0c0b..abe19235ad 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -25,7 +25,7 @@ $(call json_start) $(call add_json_str, Make_suffix, -$(TARGET_PRODUCT)) $(call add_json_str, BuildId, $(BUILD_ID)) -$(call add_json_str, BuildNumberFromFile, $(BUILD_NUMBER_FROM_FILE)) +$(call add_json_str, BuildNumberFile, build_number.txt) $(call add_json_str, Platform_version_name, $(PLATFORM_VERSION)) $(call add_json_val, Platform_sdk_version, $(PLATFORM_SDK_VERSION)) |