From 046484f8c72ca3a7e86ea1d22703dcea8e5bf8a8 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Sat, 7 Jan 2017 15:55:35 +0800 Subject: [PATCH] cm: common: Correct indentation Indentation should be 4 spaces here. Change-Id: I3484eb8bd04eb4457c4f17403381b286e1bdb1ed --- config/common.mk | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/config/common.mk b/config/common.mk index e93ffcd3..ba409ed3 100644 --- a/config/common.mk +++ b/config/common.mk @@ -317,13 +317,13 @@ else endif PRODUCT_PROPERTY_OVERRIDES += \ - ro.cm.version=$(LINEAGE_VERSION) \ - ro.cm.releasetype=$(CM_BUILDTYPE) \ - ro.modversion=$(LINEAGE_VERSION) \ - ro.cmlegal.url=https://lineageos.org/legal + ro.cm.version=$(LINEAGE_VERSION) \ + ro.cm.releasetype=$(CM_BUILDTYPE) \ + ro.modversion=$(LINEAGE_VERSION) \ + ro.cmlegal.url=https://lineageos.org/legal PRODUCT_EXTRA_RECOVERY_KEYS += \ - vendor/cm/build/target/product/security/lineage + vendor/cm/build/target/product/security/lineage -include vendor/cm-priv/keys/keys.mk @@ -331,29 +331,29 @@ CM_DISPLAY_VERSION := $(LINEAGE_VERSION) ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),) ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey) - ifneq ($(CM_BUILDTYPE), UNOFFICIAL) - ifndef TARGET_VENDOR_RELEASE_BUILD_ID - ifneq ($(CM_EXTRAVERSION),) - # Remove leading dash from CM_EXTRAVERSION - CM_EXTRAVERSION := $(shell echo $(CM_EXTRAVERSION) | sed 's/-//') - TARGET_VENDOR_RELEASE_BUILD_ID := $(CM_EXTRAVERSION) - else - TARGET_VENDOR_RELEASE_BUILD_ID := $(shell date -u +%Y%m%d) - endif - else - TARGET_VENDOR_RELEASE_BUILD_ID := $(TARGET_VENDOR_RELEASE_BUILD_ID) - endif - ifeq ($(CM_VERSION_MAINTENANCE),0) - CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) - else - CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) + ifneq ($(CM_BUILDTYPE), UNOFFICIAL) + ifndef TARGET_VENDOR_RELEASE_BUILD_ID + ifneq ($(CM_EXTRAVERSION),) + # Remove leading dash from CM_EXTRAVERSION + CM_EXTRAVERSION := $(shell echo $(CM_EXTRAVERSION) | sed 's/-//') + TARGET_VENDOR_RELEASE_BUILD_ID := $(CM_EXTRAVERSION) + else + TARGET_VENDOR_RELEASE_BUILD_ID := $(shell date -u +%Y%m%d) + endif + else + TARGET_VENDOR_RELEASE_BUILD_ID := $(TARGET_VENDOR_RELEASE_BUILD_ID) + endif + ifeq ($(CM_VERSION_MAINTENANCE),0) + CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) + else + CM_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(CM_VERSION_MAINTENANCE)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(CM_BUILD) + endif endif endif endif -endif PRODUCT_PROPERTY_OVERRIDES += \ - ro.cm.display.version=$(CM_DISPLAY_VERSION) + ro.cm.display.version=$(CM_DISPLAY_VERSION) -include $(WORKSPACE)/build_env/image-auto-bits.mk -include vendor/cm/config/partner_gms.mk