From a0dd3032a6cb24c4b438d82260e28e303f19216b Mon Sep 17 00:00:00 2001 From: Jake Weinstein Date: Mon, 17 Oct 2022 16:16:52 +0900 Subject: [PATCH] common: Remove unwanted legacy SoCs Change-Id: I7f8537517f7258dc9994cff6cd49992de82d92d5 --- BoardConfigQcom.mk | 11 +++-------- common.mk | 36 ++---------------------------------- 2 files changed, 5 insertions(+), 42 deletions(-) diff --git a/BoardConfigQcom.mk b/BoardConfigQcom.mk index ee064ef4..426f0548 100644 --- a/BoardConfigQcom.mk +++ b/BoardConfigQcom.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2020 Paranoid Android +# Copyright (C) 2022 Paranoid Android # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,21 +19,16 @@ TARGET_USES_QCOM_MM_AUDIO := true TARGET_USES_ION := true # Enable Media Extensions for HAL1 on Legacy Devices -ifeq ($(call is-board-platform-in-list, apq8084 msm8226 msm8909 msm8916 msm8937 msm8952 msm8953 msm8960 msm8974 msm8976 msm8992 msm8994 msm8996 msm8998 sdm660),true) +ifeq ($(call is-board-platform-in-list, msm8937 msm8953 msm8996 msm8998 sdm660),true) TARGET_USES_MEDIA_EXTENSIONS := true endif -# For pre-UM display and gps HAL -ifeq ($(call is-board-platform-in-list, apq8084 msm8226 msm8610 msm8974 msm8992 msm8994 msm8909 msm8916 msm8952 msm8976),true) - TARGET_USES_QCOM_BSP := true -endif - # Default mount point symlinks to false # since they are not used on 8998 and up TARGET_MOUNT_POINTS_SYMLINKS ?= false # SEPolicy -ifneq ($(call is-board-platform-in-list, msm8937 msm8953 msm8996 msm8998 qcs605 sdm660),true) +ifneq ($(call is-board-platform-in-list, msm8937 msm8953 msm8996 msm8998 sdm660),true) ifneq ($(TARGET_EXCLUDE_QCOM_SEPOLICY),true) ifneq ($(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE),) include device/qcom/sepolicy_vndr/SEPolicy.mk diff --git a/common.mk b/common.mk index 27dc660d..ce666f0d 100644 --- a/common.mk +++ b/common.mk @@ -1,4 +1,4 @@ -# Copyright 2021 Paranoid Android +# Copyright 2022 Paranoid Android # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,36 +25,18 @@ TRINKET := trinket QCOM_BOARD_PLATFORMS += \ $(MSMSTEPPE) \ $(TRINKET) \ - apq8084 \ - apq8098_latv \ atoll \ bengal \ holi \ kona \ lahaina \ lito \ - mpq8092 \ - msm8226 \ - msm8610 \ - msm8909 \ - msm8909_512 \ - msm8916 \ - msm8916_32 \ - msm8916_32_512 \ - msm8916_64 \ msm8937 \ - msm8952 \ msm8953 \ - msm8974 \ - msm8992 \ - msm8994 \ msm8996 \ msm8998 \ msmnile \ - msmnile_au \ - msm_bronze \ parrot \ - qcs605 \ sdm660 \ sdm710 \ sdm845 \ @@ -64,25 +46,14 @@ QCOM_BOARD_PLATFORMS += \ MSM_VIDC_TARGET_LIST := \ $(MSMSTEPPE) \ $(TRINKET) \ - apq8084 \ - apq8098_latv \ atoll \ kona \ lito \ - msm8226 \ - msm8610 \ - msm8909 \ - msm8916 \ msm8937 \ - msm8952 \ msm8953 \ - msm8974 \ - msm8992 \ - msm8994 \ msm8996 \ msm8998 \ msmnile \ - qcs605 \ sdm660 \ sdm710 \ sdm845 @@ -91,7 +62,6 @@ MSM_VIDC_TARGET_LIST := \ MASTER_SIDE_CP_TARGET_LIST := \ $(MSMSTEPPE) \ $(TRINKET) \ - apq8098_latv \ atoll \ bengal \ kona \ @@ -99,7 +69,6 @@ MASTER_SIDE_CP_TARGET_LIST := \ msm8996 \ msm8998 \ msmnile \ - qcs605 \ sdm660 \ sdm710 \ sdm845 @@ -125,8 +94,7 @@ include $(QCOM_COMMON_PATH)/utils.mk $(MSMSTEPPE) \ $(TRINKET) \ atoll \ - msmnile \ - msmnile_au + msmnile 4_9_FAMILY := \ msm8953 \