diff options
| author | Sen Jiang <senj@google.com> | 2017-03-24 14:33:35 -0700 |
|---|---|---|
| committer | Sen Jiang <senj@google.com> | 2017-03-29 14:21:15 -0700 |
| commit | cf6e3c2ace00674d20fc84470a7cd48daf4a7ede (patch) | |
| tree | b97e89bc50a557579f276dcb426807a641965d40 /brillo_config | |
| parent | 368d8a30500140af9220ff40b5ae9b4d476261e6 (diff) | |
| download | extras-cf6e3c2ace00674d20fc84470a7cd48daf4a7ede.tar.gz | |
os-release.d: remove deprecated cfgtree support.
They are from tier 1 and are now dead.
Test: m dist
Change-Id: Ice70d9ab0fe8ff528e2ad5de8fb4ab2bd270ba04
(cherry picked from commit 91ac1f9c0d623383fa7ad453ff70f35086061d07)
Diffstat (limited to 'brillo_config')
| -rw-r--r-- | brillo_config/Android.mk | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/brillo_config/Android.mk b/brillo_config/Android.mk index fb0cd754..e5bb75a3 100644 --- a/brillo_config/Android.mk +++ b/brillo_config/Android.mk @@ -24,12 +24,6 @@ LOCAL_MODULE_CLASS := FAKE LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY) include $(BUILD_SYSTEM)/base_rules.mk -# Attempt to populate the product id from a file in the product path. -LOADED_BRILLO_PRODUCT_ID := $(call cfgtree-get-if-exists,brillo/product_id) - -# We don't really have a default value for the product id as the backend -# interaction will not work if this is not set correctly. -$(LOCAL_BUILT_MODULE): BRILLO_PRODUCT_ID ?= "$(LOADED_BRILLO_PRODUCT_ID)" $(LOCAL_BUILT_MODULE): $(hide) mkdir -p $(dir $@) echo $(BRILLO_PRODUCT_ID) > $@ @@ -42,10 +36,6 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY) include $(BUILD_SYSTEM)/base_rules.mk -# Attempt to populate the system id from a file in the product path. -LOADED_BRILLO_SYSTEM_ID := $(call cfgtree-get-if-exists,brillo/system_id) - -$(LOCAL_BUILT_MODULE): BRILLO_SYSTEM_ID ?= "$(LOADED_BRILLO_SYSTEM_ID)" $(LOCAL_BUILT_MODULE): $(hide) mkdir -p $(dir $@) echo $(BRILLO_SYSTEM_ID) > $@ @@ -57,15 +47,9 @@ LOCAL_MODULE_CLASS := FAKE LOCAL_MODULE_PATH := $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY) include $(BUILD_SYSTEM)/base_rules.mk -# The version is set to 0 if the user did not set the actual version and -# a version cannot be loaded from the product cfgtree. +# The version is set to 0 if the user did not set the actual version. # This allows us to have a valid version number while being easy to filter. ifeq ($(BRILLO_PRODUCT_VERSION),) -# Load from file first -BRILLO_PRODUCT_VERSION := $(call cfgtree-get-if-exists,brillo/product_version) -endif -# If the version is still empty, override it with 0 -ifeq ($(BRILLO_PRODUCT_VERSION),) BRILLO_PRODUCT_VERSION := "0" endif ifeq ($(shell echo $(BRILLO_PRODUCT_VERSION) | grep -E '^[0-9]+$$'),) @@ -86,15 +70,9 @@ LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY) include $(BUILD_SYSTEM)/base_rules.mk -# The version is set to 0.0 if the user did not set the actual version and -# a version cannot be loaded from the product cfgtree. +# The version is set to 0.0 if the user did not set the actual version. # This allows us to have a valid version number while being easy to filter. ifeq ($(BRILLO_SYSTEM_VERSION),) -# Load from file first -BRILLO_SYSTEM_VERSION := $(call cfgtree-get-if-exists,brillo/system_version) -endif -# If the version is still empty, override it with 0.0 -ifeq ($(BRILLO_SYSTEM_VERSION),) BRILLO_SYSTEM_VERSION := "0.0" endif ifeq ($(shell echo $(BRILLO_SYSTEM_VERSION) | grep -E '^[0-9]+\.[0-9]+$$'),) |