From 59845bc738a58f9f52686165c7aea2493d5c2912 Mon Sep 17 00:00:00 2001 From: zzzuo Date: Thu, 13 May 2021 21:05:50 +0800 Subject: [PATCH] revert for linux tmp --- manager/Makefile | 5 ++--- model/display/Makefile | 2 +- model/input/Makefile | 4 ++-- model/network/wifi/hdfwifi.mk | 4 ++-- model/network/wifi/vendor/hi3881/Makefile | 4 ++-- model/sensor/Makefile | 2 +- network/src/Makefile | 2 +- osal/src/Makefile | 2 +- platform/platform.mk | 2 +- test/Makefile | 2 +- test/test_khdf.mk | 2 +- 11 files changed, 15 insertions(+), 16 deletions(-) diff --git a/manager/Makefile b/manager/Makefile index c76982a..6a55574 100644 --- a/manager/Makefile +++ b/manager/Makefile @@ -72,9 +72,8 @@ ccflags-y += -Iinclude/../drivers/hdf/framework/include \ -Iinclude/../drivers/hdf/framework/core/common/include/host \ -Iinclude/../drivers/hdf/framework/core/common/include/manager \ -Iinclude/../drivers/hdf/framework/core/adapter/vnode/include \ - -I../../../../third_party/bounds_checking_function/include \ + -Iinclude/../drivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include \ -Iinclude/../drivers/hdf/framework/ability/config/hcs_parser/include \ -Iinclude/../drivers/hdf/framework/include/config \ -Iinclude/../drivers/hdf/framework/ability/config/hcs_parser/include \ - -Iinclude/../drivers/hdf/khdf/osal/include \ - -Iinclude/uapi/linux + -Iinclude/../drivers/hdf/khdf/osal/include diff --git a/model/display/Makefile b/model/display/Makefile index c6646a0..0bd4d94 100755 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -34,7 +34,7 @@ ccflags-y += -lm -lc -lgcc \ -Idrivers/hdf/framework/include/core \ -Idrivers/hdf/framework/core/common/include/host \ -Idrivers/hdf/framework/ability/sbuf/include \ - -I../../../../third_party/bounds_checking_function/include \ + -Idrivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include \ -Idrivers/hdf/framework/include \ -Idrivers/hdf/framework/include/osal \ -Idrivers/hdf/framework/include/platform \ diff --git a/model/input/Makefile b/model/input/Makefile index 3c87f1f..a0ec867 100755 --- a/model/input/Makefile +++ b/model/input/Makefile @@ -45,5 +45,5 @@ ccflags-y += -Iinclude/../drivers/hdf/framework/model/input/driver \ -Iinclude/../drivers/hdf/framework/core/host/include \ -Iinclude/../drivers/hdf/framework/core/shared/include \ -Iinclude/../drivers/hdf/khdf/osal/include \ - -I../../../../third_party/bounds_checking_function/include \ - -I../../../../third_party/FreeBSD/sys/dev/evdev + -Iinclude/../drivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include \ + -Iinclude/../drivers/hdf/../../../../../../../../../../../../../third_party/FreeBSD/sys/dev/evdev diff --git a/model/network/wifi/hdfwifi.mk b/model/network/wifi/hdfwifi.mk index 180ebdb..4772e22 100755 --- a/model/network/wifi/hdfwifi.mk +++ b/model/network/wifi/hdfwifi.mk @@ -54,7 +54,7 @@ HDF_WIFI_ADAPTER_INC := \ -Idrivers/hdf/khdf/network/include HDF_WIFI_VENDOR_INC := \ - -I../../../../device/hisilicon/drivers/huawei_proprietary/wifi/driver/core + -I../../../../../../../../../../../device/hisilicon/drivers/huawei_proprietary/wifi/driver/core SECURE_LIB_INC := \ - -I../../../../third_party/bounds_checking_function/include + -Iinclude/../drivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include diff --git a/model/network/wifi/vendor/hi3881/Makefile b/model/network/wifi/vendor/hi3881/Makefile index 879133f..3e749ba 100755 --- a/model/network/wifi/vendor/hi3881/Makefile +++ b/model/network/wifi/vendor/hi3881/Makefile @@ -18,7 +18,7 @@ HDF_VENDOR_PREFIX := ../../../../../../../../../ include drivers/hdf/khdf/model/network/wifi/hdfwifi.mk -INC_TOP_PATH := ../../../../ +INC_TOP_PATH := ../../../../../../../../../../../ VENDOR_WIFI_PATH := device/hisilicon/drivers/huawei_proprietary/wifi/driver WIFI_DRIVER_DIR := hi3881 @@ -114,4 +114,4 @@ wifi-objs += $(mac-objs) $(hmac-objs) $(wal-objs) $(hcc-objs) $(MODULE_NAME)-objs := $(wifi-objs) $(plat-objs) -ccflags-$(CONFIG_DRIVERS_HI3881) += $(HI1131_HOST_CFLAGS) +ccflags-$(CONFIG_DRIVERS_HI3881) += $(HI1131_HOST_CFLAGS) \ No newline at end of file diff --git a/model/sensor/Makefile b/model/sensor/Makefile index 10da304..8cc8f30 100644 --- a/model/sensor/Makefile +++ b/model/sensor/Makefile @@ -37,4 +37,4 @@ ccflags-y += -Idrivers/hdf/framework/model/sensor/driver/include \ -Idrivers/hdf/framework/include/platform \ -Idrivers/hdf/framework/include/config \ -Idrivers/hdf/khdf/osal/include \ - -I../../../../third_party/bounds_checking_function/include + -Idrivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include diff --git a/network/src/Makefile b/network/src/Makefile index 038be61..b18464f 100755 --- a/network/src/Makefile +++ b/network/src/Makefile @@ -22,4 +22,4 @@ ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \ -Iinclude/hdf/wifi \ -Iinclude/hdf/utils \ -Iinclude/hdf/osal \ - -I../../../../third_party/bounds_checking_function/include + -Iinclude/../drivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include diff --git a/osal/src/Makefile b/osal/src/Makefile index a9b93be..e0384e6 100644 --- a/osal/src/Makefile +++ b/osal/src/Makefile @@ -18,4 +18,4 @@ ccflags-y += -Iinclude/hdf \ -Iinclude/hdf/osal \ -Iinclude/hdf/utils \ -Idrivers/hdf/khdf/osal/include \ - -I../../../../third_party/bounds_checking_function/include + -Iinclude/../drivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include diff --git a/platform/platform.mk b/platform/platform.mk index b68803e..12b60d1 100644 --- a/platform/platform.mk +++ b/platform/platform.mk @@ -31,4 +31,4 @@ ccflags-$(CONFIG_DRIVERS_HDF_PLATFORM) += -Idrivers/hdf/framework/include/platfo -Idrivers/hdf/framework/core/common/include/host \ -Idrivers/hdf/framework/ability/sbuf/include \ -Idrivers/hdf/framework/utils/include \ - -I../../../../third_party/bounds_checking_function/include + -Iinclude/../drivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include diff --git a/test/Makefile b/test/Makefile index 1dca9ed..091e955 100644 --- a/test/Makefile +++ b/test/Makefile @@ -67,7 +67,7 @@ ccflags-y += -Idrivers/hdf/framework/include \ -Idrivers/hdf/framework/core/common/include/host \ -Idrivers/hdf/framework/core/common/include/manager \ -Idrivers/hdf/framework/core/adapter/vnode/include \ - -I../../../../third_party/bounds_checking_function/include \ + -Idrivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include \ -Idrivers/hdf/framework/ability/config/hcs_parser/include \ -Idrivers/hdf/framework/test/unittest/config \ -Idrivers/hdf/framework/test/unittest/ability/config/hcs_parser/unittest \ diff --git a/test/test_khdf.mk b/test/test_khdf.mk index 0ad5cf6..1aa031e 100644 --- a/test/test_khdf.mk +++ b/test/test_khdf.mk @@ -56,7 +56,7 @@ ccflags-$(CONFIG_DRIVERS_HDF_TEST) += -Idrivers/hdf/framework/include/platform \ -I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/compoments/softap \ -I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/compoments/sta \ -I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/platform/include \ - -I../../../../third_party/bounds_checking_function/include \ + -Iinclude/../drivers/hdf/../../../../../../../../../../../../../third_party/bounds_checking_function/include \ -I$(HDF_FRAMEWORK_TEST_ROOT)/platform \ -I$(HDF_FRAMEWORK_TEST_ROOT)/wifi \ -I$(HDF_FRAMEWORK_TEST_ROOT)/platform/common \ -- Gitee