StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use ifndef or ifeq () instead of ifeq """

Browse Source
This commit is contained in:
Treehugger Robot
2017-02-22 04:25:48 +00:00
committed by Gerrit Code Review
parent 9b1a185029 63fe36abbe
commit 1948f64dd5
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -5,7 +5,7 @@
LOCAL_PATH := $(BUILD_SYSTEM) LOCAL_PATH := $(BUILD_SYSTEM)
# Pick a reasonable string to use to identify files. # Pick a reasonable string to use to identify files.
ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" ifneq (,$(filter eng.%,$(BUILD_NUMBER)))
# BUILD_NUMBER has a timestamp in it, which means that # BUILD_NUMBER has a timestamp in it, which means that
# it will change every time. Pick a stable value. # it will change every time. Pick a stable value.
FILE_NAME_TAG := eng.$(USER) FILE_NAME_TAG := eng.$(USER)
@@ -171,7 +171,7 @@ ifeq ($(TARGET_BUILD_VARIANT),user)
# release build number or branch.buld_number non-release builds # release build number or branch.buld_number non-release builds
# Dev. branches should have DISPLAY_BUILD_NUMBER set # Dev. branches should have DISPLAY_BUILD_NUMBER set
ifeq "true" "$(DISPLAY_BUILD_NUMBER)" 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) $(BUILD_KEYS)
else else
BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS) BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS)

4
core/cleanbuild.mk
View File

@@ -165,7 +165,7 @@ PREVIOUS_BUILD_CONFIG :=
PREVIOUS_BUILD_CONFIG := $(strip $(PREVIOUS_BUILD_CONFIG)) PREVIOUS_BUILD_CONFIG := $(strip $(PREVIOUS_BUILD_CONFIG))
ifdef PREVIOUS_BUILD_CONFIG ifdef PREVIOUS_BUILD_CONFIG
ifneq "$(current_build_config)" "$(PREVIOUS_BUILD_CONFIG)" ifneq ($(current_build_config),$(PREVIOUS_BUILD_CONFIG))
$(info *** Build configuration changed: "$(PREVIOUS_BUILD_CONFIG)" -> "$(current_build_config)") $(info *** Build configuration changed: "$(PREVIOUS_BUILD_CONFIG)" -> "$(current_build_config)")
ifneq ($(DISABLE_AUTO_INSTALLCLEAN),true) ifneq ($(DISABLE_AUTO_INSTALLCLEAN),true)
force_installclean := true force_installclean := true
@@ -272,7 +272,7 @@ installclean: dataclean
$(hide) rm -rf $(FILES) $(hide) rm -rf $(FILES)
@echo "Deleted images and staging directories." @echo "Deleted images and staging directories."
ifeq "$(force_installclean)" "true" ifeq ($(force_installclean),true)
$(info *** Forcing "make installclean"...) $(info *** Forcing "make installclean"...)
$(info *** rm -rf $(dataclean_files) $(installclean_files)) $(info *** rm -rf $(dataclean_files) $(installclean_files))
$(shell rm -rf $(dataclean_files) $(installclean_files)) $(shell rm -rf $(dataclean_files) $(installclean_files))

28
core/version_defaults.mk
View File

@@ -34,7 +34,7 @@
# if the file exists. # if the file exists.
# #
INTERNAL_BUILD_ID_MAKEFILE := $(wildcard $(BUILD_SYSTEM)/build_id.mk) INTERNAL_BUILD_ID_MAKEFILE := $(wildcard $(BUILD_SYSTEM)/build_id.mk)
ifneq "" "$(INTERNAL_BUILD_ID_MAKEFILE)" ifdef INTERNAL_BUILD_ID_MAKEFILE
include $(INTERNAL_BUILD_ID_MAKEFILE) include $(INTERNAL_BUILD_ID_MAKEFILE)
endif endif
@@ -76,7 +76,7 @@ ENABLED_VERSIONS := $(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VE
$(foreach v,$(ENABLED_VERSIONS), \ $(foreach v,$(ENABLED_VERSIONS), \
$(eval IS_AT_LEAST_$(v) := true)) $(eval IS_AT_LEAST_$(v) := true))
ifeq "" "$(PLATFORM_VERSION)" ifndef PLATFORM_VERSION
# This is the canonical definition of the platform version, # This is the canonical definition of the platform version,
# which is the version that we reveal to the end user. # which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather # Update this value when the platform version changes (rather
@@ -84,7 +84,7 @@ ifeq "" "$(PLATFORM_VERSION)"
PLATFORM_VERSION := 7.1.1 PLATFORM_VERSION := 7.1.1
endif endif
ifeq "" "$(PLATFORM_SDK_VERSION)" ifndef PLATFORM_SDK_VERSION
# This is the canonical definition of the SDK version, which defines # This is the canonical definition of the SDK version, which defines
# the set of APIs and functionality available in the platform. It # the set of APIs and functionality available in the platform. It
# is a single integer that increases monotonically as updates to # is a single integer that increases monotonically as updates to
@@ -96,7 +96,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)"
PLATFORM_SDK_VERSION := 25 PLATFORM_SDK_VERSION := 25
endif endif
ifeq "" "$(PLATFORM_JACK_MIN_SDK_VERSION)" ifndef PLATFORM_JACK_MIN_SDK_VERSION
# This is definition of the min SDK version given to Jack for the current # This is definition of the min SDK version given to Jack for the current
# platform. For released version it should be the same as # platform. For released version it should be the same as
# PLATFORM_SDK_VERSION. During development, this number may be incremented # PLATFORM_SDK_VERSION. During development, this number may be incremented
@@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_JACK_MIN_SDK_VERSION)"
PLATFORM_JACK_MIN_SDK_VERSION := o-b1 PLATFORM_JACK_MIN_SDK_VERSION := o-b1
endif endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)" ifndef PLATFORM_VERSION_CODENAME
# This is the current development code-name, if the build is not a final # This is the current development code-name, if the build is not a final
# release build. If this is a final release build, it is simply "REL". # release build. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME := REL PLATFORM_VERSION_CODENAME := REL
@@ -116,10 +116,10 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)"
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME) PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
endif endif
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" ifeq (REL,$(PLATFORM_VERSION_CODENAME))
PLATFORM_PREVIEW_SDK_VERSION := 0 PLATFORM_PREVIEW_SDK_VERSION := 0
else else
ifeq "" "$(PLATFORM_PREVIEW_SDK_VERSION)" ifndef PLATFORM_PREVIEW_SDK_VERSION
# This is the definition of a preview SDK version over and above the current # This is the definition of a preview SDK version over and above the current
# platform SDK version. Unlike the platform SDK version, a higher value # platform SDK version. Unlike the platform SDK version, a higher value
# for preview SDK version does NOT mean that all prior preview APIs are # for preview SDK version does NOT mean that all prior preview APIs are
@@ -133,20 +133,20 @@ else
endif endif
endif endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)" ifndef DEFAULT_APP_TARGET_SDK
# This is the default minSdkVersion and targetSdkVersion to use for # This is the default minSdkVersion and targetSdkVersion to use for
# all .apks created by the build system. It can be overridden by explicitly # all .apks created by the build system. It can be overridden by explicitly
# setting these in the .apk's AndroidManifest.xml. It is either the code # setting these in the .apk's AndroidManifest.xml. It is either the code
# name of the development build or, if this is a release build, the official # name of the development build or, if this is a release build, the official
# SDK version of this release. # SDK version of this release.
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" ifeq (REL,$(PLATFORM_VERSION_CODENAME))
DEFAULT_APP_TARGET_SDK := $(PLATFORM_SDK_VERSION) DEFAULT_APP_TARGET_SDK := $(PLATFORM_SDK_VERSION)
else else
DEFAULT_APP_TARGET_SDK := $(PLATFORM_VERSION_CODENAME) DEFAULT_APP_TARGET_SDK := $(PLATFORM_VERSION_CODENAME)
endif endif
endif endif
ifeq "" "$(PLATFORM_SECURITY_PATCH)" ifndef PLATFORM_SECURITY_PATCH
# Used to indicate the security patch that has been applied to the device. # Used to indicate the security patch that has been applied to the device.
# It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin. # It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin.
# It must be of the form "YYYY-MM-DD" on production devices. # It must be of the form "YYYY-MM-DD" on production devices.
@@ -155,7 +155,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
PLATFORM_SECURITY_PATCH := 2016-11-05 PLATFORM_SECURITY_PATCH := 2016-11-05
endif endif
ifeq "" "$(PLATFORM_BASE_OS)" ifndef PLATFORM_BASE_OS
# Used to indicate the base os applied to the device. # Used to indicate the base os applied to the device.
# Can be an arbitrary string, but must be a single word. # Can be an arbitrary string, but must be a single word.
# #
@@ -163,7 +163,7 @@ ifeq "" "$(PLATFORM_BASE_OS)"
PLATFORM_BASE_OS := PLATFORM_BASE_OS :=
endif endif
ifeq "" "$(BUILD_ID)" ifndef BUILD_ID
# Used to signify special builds. E.g., branches and/or releases, # Used to signify special builds. E.g., branches and/or releases,
# like "M5-RC7". Can be an arbitrary string, but must be a single # like "M5-RC7". Can be an arbitrary string, but must be a single
# word and a valid file name. # word and a valid file name.
@@ -172,7 +172,7 @@ ifeq "" "$(BUILD_ID)"
BUILD_ID := UNKNOWN BUILD_ID := UNKNOWN
endif endif
ifeq "" "$(BUILD_DATETIME)" ifndef BUILD_DATETIME
# Used to reproduce builds by setting the same time. Must be the number # Used to reproduce builds by setting the same time. Must be the number
# of seconds since the Epoch. # of seconds since the Epoch.
BUILD_DATETIME := $(shell date +%s) BUILD_DATETIME := $(shell date +%s)
@@ -184,7 +184,7 @@ else
DATE := date -d @$(BUILD_DATETIME) DATE := date -d @$(BUILD_DATETIME)
endif endif
ifeq "" "$(BUILD_NUMBER)" ifndef BUILD_NUMBER
# BUILD_NUMBER should be set to the source control value that # BUILD_NUMBER should be set to the source control value that
# represents the current state of the source code. E.g., a # represents the current state of the source code. E.g., a
# perforce changelist number or a git hash. Can be an arbitrary string # perforce changelist number or a git hash. Can be an arbitrary string