From 703f6e13267dbb5b280de41e96b72107cf01c82f Mon Sep 17 00:00:00 2001 From: Jacky Liu Date: Fri, 9 Jun 2023 17:02:28 +0800 Subject: [PATCH] Define LOCAL_PATH LOCAL_PATH is not guaranteed, define it before using. Bug: 286503615 Test: build Change-Id: I93f1e8995488e3dd6510c7424f109e8f943f42ce --- device-husky.mk | 4 +++- device-shiba.mk | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index f778272..eae1083 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -17,6 +17,8 @@ TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/shusky-kernel/kernel-headers +LOCAL_PATH := device/google/shusky + ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) USE_UWBFIELDTESTQM := true endif @@ -96,7 +98,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_husky.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_husky_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_husky_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv # POF PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index e4aa651..cca0675 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -17,6 +17,8 @@ TARGET_KERNEL_DIR ?= device/google/shusky-kernel TARGET_BOARD_KERNEL_HEADERS := device/google/shusky-kernel/kernel-headers +LOCAL_PATH := device/google/shusky + $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) @@ -86,7 +88,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_shiba.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_shiba_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_shiba_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv # POF PRODUCT_PRODUCT_PROPERTIES += \