Loading core/sysprop.mk +3 −3 Original line number Diff line number Diff line Loading @@ -213,9 +213,9 @@ ifeq ($(TARGET_BUILD_VARIANT),user) # Dev. branches should have DISPLAY_BUILD_NUMBER set ifeq (true,$(DISPLAY_BUILD_NUMBER)) BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS) BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) else BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS) BUILD_DISPLAY_ID := $(BUILD_ID) endif else # Non-user builds should show detailed build information Loading @@ -226,7 +226,7 @@ endif # harness to distinguish builds. Only add _asan for a sanitized build # if it isn't already a part of the flavor (via a dedicated lunch # config for example). TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(SPOOFED_TARGET_BUILD_VARIANT) ifneq (, $(filter address, $(SANITIZE_TARGET))) ifeq (,$(findstring _asan,$(TARGET_BUILD_FLAVOR))) TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan Loading Loading
core/sysprop.mk +3 −3 Original line number Diff line number Diff line Loading @@ -213,9 +213,9 @@ ifeq ($(TARGET_BUILD_VARIANT),user) # Dev. branches should have DISPLAY_BUILD_NUMBER set ifeq (true,$(DISPLAY_BUILD_NUMBER)) BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS) BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) else BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS) BUILD_DISPLAY_ID := $(BUILD_ID) endif else # Non-user builds should show detailed build information Loading @@ -226,7 +226,7 @@ endif # harness to distinguish builds. Only add _asan for a sanitized build # if it isn't already a part of the flavor (via a dedicated lunch # config for example). TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT) TARGET_BUILD_FLAVOR := $(TARGET_PRODUCT)-$(SPOOFED_TARGET_BUILD_VARIANT) ifneq (, $(filter address, $(SANITIZE_TARGET))) ifeq (,$(findstring _asan,$(TARGET_BUILD_FLAVOR))) TARGET_BUILD_FLAVOR := $(TARGET_BUILD_FLAVOR)_asan Loading