From 5752005ee486cbb298305f19b057618fa5807593 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 7 Apr 2023 16:03:58 -0700 Subject: [PATCH] Remove device.mk It just consisted of unused functions/variables, and had no edits since the initial publish of android to git. It appears like it was panned to have a device config similar to product config but was never completed. Test: Presubmits Change-Id: I0ffcef1ae8bfd0611f1bede387f0c3e01fe53581 --- core/device.mk | 76 ------------------------------------------ core/product_config.mk | 1 - 2 files changed, 77 deletions(-) delete mode 100644 core/device.mk diff --git a/core/device.mk b/core/device.mk deleted file mode 100644 index 20ff447caa..0000000000 --- a/core/device.mk +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (C) 2007 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -_device_var_list := \ - DEVICE_NAME \ - DEVICE_BOARD \ - DEVICE_REGION - -define dump-device -$(info ==== $(1) ====)\ -$(foreach v,$(_device_var_list),\ -$(info DEVICES.$(1).$(v) := $(DEVICES.$(1).$(v))))\ -$(info --------) -endef - -define dump-devices -$(foreach p,$(DEVICES),$(call dump-device,$(p))) -endef - -# -# $(1): device to inherit -# -define inherit-device - $(foreach v,$(_device_var_list), \ - $(eval $(v) := $($(v)) $(INHERIT_TAG)$(strip $(1)))) -endef - -# -# $(1): device makefile list -# -#TODO: check to make sure that devices have all the necessary vars defined -define import-devices -$(call import-nodes,DEVICES,$(1),$(_device_var_list)) -endef - - -# -# $(1): short device name like "sooner" -# -define _resolve-short-device-name - $(eval dn := $(strip $(1))) - $(eval d := \ - $(foreach d,$(DEVICES), \ - $(if $(filter $(dn),$(DEVICES.$(d).DEVICE_NAME)), \ - $(d) \ - )) \ - ) - $(eval d := $(sort $(d))) - $(if $(filter 1,$(words $(d))), \ - $(d), \ - $(if $(filter 0,$(words $(d))), \ - $(error No matches for device "$(dn)"), \ - $(error Device "$(dn)" ambiguous: matches $(d)) \ - ) \ - ) -endef - -# -# $(1): short device name like "sooner" -# -define resolve-short-device-name -$(strip $(call _resolve-short-device-name,$(1))) -endef diff --git a/core/product_config.mk b/core/product_config.mk index 7055a1e958..db8ca01acc 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -144,7 +144,6 @@ endif # include $(BUILD_SYSTEM)/node_fns.mk include $(BUILD_SYSTEM)/product.mk -include $(BUILD_SYSTEM)/device.mk # Read all product definitions. #