diff options
author | Roman Kiryanov <rkir@google.com> | 2024-04-30 16:04:26 -0700 |
---|---|---|
committer | Roman Kiryanov <rkir@google.com> | 2024-04-30 21:07:11 -0700 |
commit | 5d76f3443d2283598eb3d77748043a537c3b28f0 (patch) | |
tree | 2f6bc8c2ed1d139a6f7cee7f42413a954b85c054 | |
parent | da220beed8dee78815fff56bfecc5c58772e993a (diff) | |
download | goldfish-5d76f3443d2283598eb3d77748043a537c3b28f0.tar.gz |
Move handheld specific stuff into handheld.mk
Bug: 337081933
Test: presubmit
Change-Id: I850dd5b45878dc10a91231c84da9a6b1b507e2b7
Signed-off-by: Roman Kiryanov <rkir@google.com>
-rw-r--r-- | product/handheld.mk | 22 | ||||
-rw-r--r-- | product/phone.mk | 6 | ||||
-rw-r--r-- | product/tablet.mk | 7 |
3 files changed, 25 insertions, 10 deletions
diff --git a/product/handheld.mk b/product/handheld.mk new file mode 100644 index 00000000..c4e65c7a --- /dev/null +++ b/product/handheld.mk @@ -0,0 +1,22 @@ +# +# Copyright (C) 2024 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. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) +$(call inherit-product, frameworks/base/data/sounds/AllAudio.mk) + diff --git a/product/phone.mk b/product/phone.mk index 383e713c..b9f07ce8 100644 --- a/product/phone.mk +++ b/product/phone.mk @@ -13,11 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) +$(call inherit-product, device/generic/goldfish/product/handheld.mk) + $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) DEVICE_PACKAGE_OVERLAYS += device/generic/goldfish/phone/overlay diff --git a/product/tablet.mk b/product/tablet.mk index 12492c13..f0603269 100644 --- a/product/tablet.mk +++ b/product/tablet.mk @@ -13,12 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) -$(call inherit-product, frameworks/base/data/sounds/AllAudio.mk) +$(call inherit-product, device/generic/goldfish/product/handheld.mk) DEVICE_PACKAGE_OVERLAYS += device/generic/goldfish/tablet/overlay PRODUCT_CHARACTERISTICS := tablet,nosdcard |