From e35c5c3a6aecaba1b7e72d5ca10a173cc3b75c17 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 9 Jun 2022 15:08:33 +0100 Subject: [PATCH] sabrina: Unset DEVICE_PATH in the product makefile There's no need for this, make use of LOCAL_PATH instead. Change-Id: I94642c86049d85d1b4f372309bc5899f9876ffe3 --- device.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/device.mk b/device.mk index 642a4c4..e6a7770 100644 --- a/device.mk +++ b/device.mk @@ -1,11 +1,9 @@ # -# Copyright (C) 2021 The LineageOS Project +# Copyright (C) 2021-2022 The LineageOS Project # # SPDX-License-Identifier: Apache-2.0 # -DEVICE_PATH := device/google/sabrina - $(call inherit-product, vendor/google/sabrina/sabrina-vendor.mk) $(call inherit-product, device/amlogic/g12-common/g12.mk) @@ -16,10 +14,10 @@ PRODUCT_PACKAGES += \ ## Init-Files PRODUCT_COPY_FILES += \ - $(DEVICE_PATH)/init-files/tee_hdcp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee_hdcp.rc \ - $(DEVICE_PATH)/init-files/tee_key_inject.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee_key_inject.rc \ - $(DEVICE_PATH)/init-files/init.amlogic.sku.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.sku.rc \ - $(DEVICE_PATH)/init-files/init.amlogic.wifi_buildin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc + $(LOCAL_PATH)/init-files/tee_hdcp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee_hdcp.rc \ + $(LOCAL_PATH)/init-files/tee_key_inject.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee_key_inject.rc \ + $(LOCAL_PATH)/init-files/init.amlogic.sku.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.sku.rc \ + $(LOCAL_PATH)/init-files/init.amlogic.wifi_buildin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi_buildin.rc ## Kernel Modules PRODUCT_PACKAGES += \ @@ -27,7 +25,7 @@ PRODUCT_PACKAGES += \ ## Overlays DEVICE_PACKAGE_OVERLAYS += \ - $(DEVICE_PATH)/overlay + $(LOCAL_PATH)/overlay ## Wi-Fi TARGET_DHD_VERSION := bcmdhd.100.10.545.x -- 2.20.1