From 78583fd322e88681d991120bc02a1f070cf2fbea Mon Sep 17 00:00:00 2001 From: yuanbo Date: Thu, 16 Sep 2021 17:37:29 +0800 Subject: [PATCH] enable kernel build with external obj output Signed-off-by: yuanbo --- .gitignore | 4 - config/Makefile | 16 +-- manager/Makefile | 38 +++---- model/audio/Makefile | 36 +++--- model/display/Makefile | 30 ++--- model/input/Makefile | 30 ++--- model/misc/dsoftbus/Makefile | 26 ++--- model/misc/vibrator/Makefile | 28 ++--- model/network/bluetooth/env_config.mk | 44 ++++---- model/network/wifi/hdfwifi.mk | 68 +++++------ model/network/wifi/vendor/hi3881/Makefile | 2 +- .../network/wifi/vendor/hi3881/env_config.mk | 18 +-- model/sensor/Makefile | 57 +++++----- model/storage/Makefile | 24 ++-- model/usb/device/Makefile | 20 ++-- model/usb/host/Makefile | 26 ++--- network/src/Makefile | 16 +-- osal/src/Makefile | 12 +- platform/platform.mk | 42 +++---- test/Makefile | 60 +++++----- test/test_khdf.mk | 106 +++++++++--------- 21 files changed, 348 insertions(+), 355 deletions(-) diff --git a/.gitignore b/.gitignore index 9e65b91..f741dfa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -*.cmd -*.o -*.a -*.d *.hcb diff --git a/config/Makefile b/config/Makefile index e926d04..3a9a7a8 100755 --- a/config/Makefile +++ b/config/Makefile @@ -17,11 +17,11 @@ obj-y += ../../../../framework/ability/config/device_resource_if.o \ ../../../../framework/ability/config/hcs_parser/src/hcs_generate_tree.o \ ../../../../framework/ability/config/hcs_parser/src/hcs_parser.o \ ../../../../framework/ability/config/hcs_parser/src/hcs_tree_if.o -ccflags-y += -Iinclude/hdf \ - -Iinclude/hdf/osal \ - -Iinclude/hdf/utils \ - -Idrivers/hdf/khdf/osal/include \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/framework/ability/config/hcs_parser/include +ccflags-y +=-I$(srctree)/include/hdf \ + -I$(srctree)/include/hdf/osal \ + -I$(srctree)/include/hdf/utils \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/framework/ability/config/hcs_parser/include diff --git a/manager/Makefile b/manager/Makefile index a7c1812..0bf21b2 100644 --- a/manager/Makefile +++ b/manager/Makefile @@ -60,22 +60,22 @@ obj-y += \ $(SEC_FUNCTION_OBJECTS) ccflags-y += \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/core/host/include \ - -Idrivers/hdf/framework/core/manager/include \ - -Idrivers/hdf/framework/core/shared/include \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/core/common/include/manager \ - -Idrivers/hdf/framework/core/adapter/vnode/include \ - -Idrivers/hdf/framework/ability/config/hcs_parser/include \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/framework/ability/config/hcs_parser/include \ - -Idrivers/hdf/khdf/osal/include \ - -Iinclude/uapi/linux \ - -Ibounds_checking_function/include + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/core/host/include \ + -I$(srctree)/drivers/hdf/framework/core/manager/include \ + -I$(srctree)/drivers/hdf/framework/core/shared/include \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/core/common/include/manager \ + -I$(srctree)/drivers/hdf/framework/core/adapter/vnode/include \ + -I$(srctree)/drivers/hdf/framework/ability/config/hcs_parser/include \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/framework/ability/config/hcs_parser/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/include/uapi/linux \ + -I$(srctree)/bounds_checking_function/include diff --git a/model/audio/Makefile b/model/audio/Makefile index aa3fce5..d4b8c23 100755 --- a/model/audio/Makefile +++ b/model/audio/Makefile @@ -44,21 +44,21 @@ obj-$(CONFIG_ARCH_HI3516DV300) += \ $(KHDF_AUDIO_HI3516DV300_DIR)/soc/src/hi3516_platform_adapter.o ccflags-y += -lm -lc -lgcc -std=gnu99 -Werror \ - -I$(KHDF_AUDIO_KHDF_ROOT_DIR)/osal/include \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/include/core \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/include/utils \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/include/osal \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/include/platform \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/include/config \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/include/audio \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/ability/sbuf/include \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/core/common/include/host \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/core/include \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/sapm/include \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/dispatch/include \ - -I$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/common/include \ - -I$(KHDF_AUDIO_HI3516DV300_INC_DIR)/codec/include \ - -I$(KHDF_AUDIO_HI3516DV300_INC_DIR)/soc/include \ - -I$(KHDF_AUDIO_HI3516DV300_INC_DIR)/include \ - -I$(KHDF_AUDIO_HI3516DV300_INC_DIR)/../tfa9879/accessory/include \ - -Ibounds_checking_function/include + -I$(srctree)/$(KHDF_AUDIO_KHDF_ROOT_DIR)/osal/include \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/core \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/utils \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/osal \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/platform \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/config \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/include/audio \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/ability/sbuf/include \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/core/common/include/host \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/core/include \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/sapm/include \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/dispatch/include \ + -I$(srctree)/$(KHDF_FRAMEWORK_ROOT_DIR)/model/audio/common/include \ + -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/codec/include \ + -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/soc/include \ + -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/include \ + -I$(srctree)/$(KHDF_AUDIO_HI3516DV300_INC_DIR)/../tfa9879/accessory/include \ + -I$(srctree)/bounds_checking_function/include diff --git a/model/display/Makefile b/model/display/Makefile index cbe7c80..15aaf50 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -38,20 +38,20 @@ obj-$(CONFIG_DRIVERS_HDF_LCD_ST7789) += \ $(DISPLAY_ROOT_DIR)/panel/ssp_st7789.o ccflags-y += -lm -lc -lgcc \ - -Idrivers/hdf/framework/model/display/driver \ - -Idrivers/hdf/framework/model/display/driver/adapter_soc \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/model/display/driver/backlight \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/khdf/osal/include \ - -Iinclude/linux \ - -Iinclude/drm -ccflags-y += -Ibounds_checking_function/include + -I$(srctree)/drivers/hdf/framework/model/display/driver \ + -I$(srctree)/drivers/hdf/framework/model/display/driver/adapter_soc \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/model/display/driver/backlight \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/include/linux \ + -I$(srctree)/include/drm +ccflags-y +=-I$(srctree)/bounds_checking_function/include endif \ No newline at end of file diff --git a/model/input/Makefile b/model/input/Makefile index bac240b..41e51ba 100644 --- a/model/input/Makefile +++ b/model/input/Makefile @@ -28,18 +28,18 @@ obj-$(CONFIG_DRIVERS_HDF_TP_5P5_GT911) += \ obj-$(CONFIG_DRIVERS_HDF_TP_2P35_FT6236) += \ $(INPUT_ROOT_DIR)/touchscreen/touch_ft6336.o -ccflags-y += -Idrivers/hdf/framework/model/input/driver \ - -Idrivers/hdf/framework/model/input/driver/input_bus_ops \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/framework/core/host/include \ - -Idrivers/hdf/framework/core/shared/include \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/khdf/osal/include -ccflags-y += -Ibounds_checking_function/include \ - -Idrivers/hdf/evdev +ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/input/driver \ + -I$(srctree)/drivers/hdf/framework/model/input/driver/input_bus_ops \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/framework/core/host/include \ + -I$(srctree)/drivers/hdf/framework/core/shared/include \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include +ccflags-y +=-I$(srctree)/bounds_checking_function/include \ + -I$(srctree)/drivers/hdf/evdev diff --git a/model/misc/dsoftbus/Makefile b/model/misc/dsoftbus/Makefile index fec8953..043d6a4 100644 --- a/model/misc/dsoftbus/Makefile +++ b/model/misc/dsoftbus/Makefile @@ -22,16 +22,16 @@ obj-$(CONFIG_DRIVERS_HDF_DSOFTBUS) += $(DSOFTBUS_ROOT_DIR)/src/wlan_param_monito ccflags-$(CONFIG_DRIVERS_HDF_DSOFTBUS) +=-DENABLE_WLAN_PARAM_MONITOR endif -ccflags-y += -Idrivers/hdf/framework/model/misc/dsoftbus/include \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/framework/core/host/include \ - -Idrivers/hdf/framework/core/shared/include \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/khdf/osal/include \ - -Ibounds_checking_function/include +ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/misc/dsoftbus/include \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/framework/core/host/include \ + -I$(srctree)/drivers/hdf/framework/core/shared/include \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/bounds_checking_function/include diff --git a/model/misc/vibrator/Makefile b/model/misc/vibrator/Makefile index 14c26be..9bec1f9 100644 --- a/model/misc/vibrator/Makefile +++ b/model/misc/vibrator/Makefile @@ -21,17 +21,17 @@ obj-$(CONFIG_DRIVERS_HDF_VIBRATOR_LINEAR) += \ $(VIBRATOR_ROOT_DIR)/chipset/vibrator_linear_driver.o -ccflags-y += -Idrivers/hdf/framework/model/misc/vibrator/driver/include \ - -Idrivers/hdf/framework/model/misc/vibrator/driver/chipset \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/framework/core/host/include \ - -Idrivers/hdf/framework/core/shared/include \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/khdf/osal/include \ - -Ibounds_checking_function/include +ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/misc/vibrator/driver/include \ + -I$(srctree)/drivers/hdf/framework/model/misc/vibrator/driver/chipset \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/framework/core/host/include \ + -I$(srctree)/drivers/hdf/framework/core/shared/include \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/bounds_checking_function/include diff --git a/model/network/bluetooth/env_config.mk b/model/network/bluetooth/env_config.mk index a91a0b8..c5faac2 100644 --- a/model/network/bluetooth/env_config.mk +++ b/model/network/bluetooth/env_config.mk @@ -13,29 +13,29 @@ # HDF_FRAMEWORKS_INC := \ - -I./ \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/core/host/include \ - -Idrivers/hdf/framework/core/manager/include \ - -Idrivers/hdf/framework/core/shared/include \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/support/platform/include \ - -Idrivers/hdf/framework/support/platform/include/platform \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/khdf/osal/include \ - -Idrivers/hdf/khdf/config/include \ - -Iinclude/hdf \ - -Iinclude/hdf/osal \ - -Iinclude/hdf/utils \ - -Idrivers/hdf/framework/include/bluetooth + -I$(srctree)/./ \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/core/host/include \ + -I$(srctree)/drivers/hdf/framework/core/manager/include \ + -I$(srctree)/drivers/hdf/framework/core/shared/include \ + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/support/platform/include \ + -I$(srctree)/drivers/hdf/framework/support/platform/include/platform \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/drivers/hdf/khdf/config/include \ + -I$(srctree)/include/hdf \ + -I$(srctree)/include/hdf/osal \ + -I$(srctree)/include/hdf/utils \ + -I$(srctree)/drivers/hdf/framework/include/bluetooth HDF_BT_FRAMEWORKS_INC := \ - -Idrivers/hdf/framework/model/network/bluetooth + -I$(srctree)/drivers/hdf/framework/model/network/bluetooth SECURE_LIB_INC := \ - -Ibounds_checking_function/include \ No newline at end of file + -I$(srctree)/bounds_checking_function/include \ No newline at end of file diff --git a/model/network/wifi/hdfwifi.mk b/model/network/wifi/hdfwifi.mk index 31e4005..dd60bf6 100644 --- a/model/network/wifi/hdfwifi.mk +++ b/model/network/wifi/hdfwifi.mk @@ -16,45 +16,45 @@ HDF_WIFI_FRAMEWORKS_ROOT = $(HDF_DIR_PREFIX)/framework/model/network/wifi HDF_WIFI_KHDF_FRAMEWORKS_ROOT = $(HDF_DIR_PREFIX)/adapter/khdf/linux/model/network/wifi HDF_WIFI_VENDOR_ROOT = $(HDF_VENDOR_PREFIX)/device/hisilicon/drivers/wifi/driver HDF_FRAMEWORKS_INC := \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/core/host/include \ - -Idrivers/hdf/framework/core/manager/include \ - -Idrivers/hdf/framework/core/shared/include \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/support/platform/include \ - -Idrivers/hdf/framework/support/platform/include/platform \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/khdf/osal/include \ - -Idrivers/hdf/khdf/config/include \ - -Iinclude/hdf \ - -Iinclude/hdf/osal \ - -Iinclude/hdf/utils + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/core/host/include \ + -I$(srctree)/drivers/hdf/framework/core/manager/include \ + -I$(srctree)/drivers/hdf/framework/core/shared/include \ + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/support/platform/include \ + -I$(srctree)/drivers/hdf/framework/support/platform/include/platform \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/drivers/hdf/khdf/config/include \ + -I$(srctree)/include/hdf \ + -I$(srctree)/include/hdf/osal \ + -I$(srctree)/include/hdf/utils HDF_WIFI_FRAMEWORKS_INC := \ - -Idrivers/hdf/framework/model/network/wifi/core/components/eapol \ - -Idrivers/hdf/framework/model/network/wifi/core/components/softap \ - -Idrivers/hdf/framework/model/network/wifi/core/components/sta \ - -Idrivers/hdf/framework/model/network/wifi/include \ - -Idrivers/hdf/framework/model/network/wifi/core \ - -Idrivers/hdf/framework/model/network/wifi/core/module \ - -Idrivers/hdf/framework/model/network/common/netdevice \ - -Idrivers/hdf/framework/model/network/wifi/platform/include \ - -Idrivers/hdf/framework/model/network/wifi/platform/include/message \ - -Idrivers/hdf/framework/model/network/wifi/client/include \ - -Idrivers/hdf/framework/include/wifi \ - -Idrivers/hdf/framework/include/net \ - -Idrivers/hdf/frameworks/model/network/wifi/bus + -I$(srctree)/drivers/hdf/framework/model/network/wifi/core/components/eapol \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/core/components/softap \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/core/components/sta \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/include \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/core \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/core/module \ + -I$(srctree)/drivers/hdf/framework/model/network/common/netdevice \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/platform/include \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/platform/include/message \ + -I$(srctree)/drivers/hdf/framework/model/network/wifi/client/include \ + -I$(srctree)/drivers/hdf/framework/include/wifi \ + -I$(srctree)/drivers/hdf/framework/include/net \ + -I$(srctree)/drivers/hdf/frameworks/model/network/wifi/bus HDF_WIFI_ADAPTER_INC := \ - -Idrivers/hdf/khdf/network/include + -I$(srctree)/drivers/hdf/khdf/network/include HDF_WIFI_VENDOR_INC := \ - -Idrivers/hdf/wifi/driver/core + -I$(srctree)/drivers/hdf/wifi/driver/core SECURE_LIB_INC := \ - -Ibounds_checking_function/include + -I$(srctree)/bounds_checking_function/include diff --git a/model/network/wifi/vendor/hi3881/Makefile b/model/network/wifi/vendor/hi3881/Makefile index 3d10398..23b3932 100644 --- a/model/network/wifi/vendor/hi3881/Makefile +++ b/model/network/wifi/vendor/hi3881/Makefile @@ -39,7 +39,7 @@ ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \ $(HDF_WIFI_FRAMEWORKS_INC) \ $(HDF_WIFI_ADAPTER_INC) \ $(HDF_WIFI_VENDOR_INC) \ - -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/linuxkpi/include \ + -I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/linuxkpi/include \ $(SECURE_LIB_INC) include drivers/hdf/khdf/model/network/wifi/vendor/hi3881/env_config.mk diff --git a/model/network/wifi/vendor/hi3881/env_config.mk b/model/network/wifi/vendor/hi3881/env_config.mk index c6c0f75..c9256c0 100644 --- a/model/network/wifi/vendor/hi3881/env_config.mk +++ b/model/network/wifi/vendor/hi3881/env_config.mk @@ -279,18 +279,18 @@ HI1131_WIFI_CFLAGS +=-D_PRE_FEATURE_HCC_TASK endif ################################WIFI_DRIVER_DIR############################## -HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/wal -HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/oam -HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/mac/hmac +HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/wal +HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/oam +HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/mac/hmac -HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/mac/common -HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/hcc -HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/frw -HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/oal -HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/include +HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/mac/common +HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/hcc +HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/frw +HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/oal +HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/include ################################device############################## -HI1131_WIFI_CFLAGS += -I$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/hdfadapt +HI1131_WIFI_CFLAGS +=-I$(srctree)/$(INC_TOP_PATH)/$(WIFI_DRIVER_DIR)/hdfadapt ifeq ($(LOSCFG_PLATFORM_HI3516EV300), y) HI1131_WIFI_CFLAGS +=-DHISI_WIFI_PLATFORM_HI3516EV300 diff --git a/model/sensor/Makefile b/model/sensor/Makefile index efd2e24..7ff966c 100644 --- a/model/sensor/Makefile +++ b/model/sensor/Makefile @@ -9,17 +9,14 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -PWD:=$(shell pwd) -SEC_OBJECTS:=$(patsubst %.c,%.o,$(SEC_LIB_SOURCES)) - SENSOR_ROOT_DIR = ../../../../../framework/model/sensor/driver obj-$(CONFIG_DRIVERS_HDF_SENSOR) += \ $(SENSOR_ROOT_DIR)/common/src/sensor_config_controller.o \ $(SENSOR_ROOT_DIR)/common/src/sensor_config_parser.o \ $(SENSOR_ROOT_DIR)/common/src/sensor_device_manager.o \ - $(SENSOR_ROOT_DIR)/common/src/sensor_platform_if.o - + $(SENSOR_ROOT_DIR)/common/src/sensor_platform_if.o + obj-$(CONFIG_DRIVERS_HDF_SENSOR_ACCEL) += $(SENSOR_ROOT_DIR)/accel/sensor_accel_driver.o @@ -38,7 +35,7 @@ obj-$(CONFIG_DRIVERS_HDF_SENSOR_BAROMETER) += $(SENSOR_ROOT_DIR)/barometer/senso obj-$(CONFIG_DRIVERS_HDF_SENSOR_BAROMETER_BMP180) += $(SENSOR_ROOT_DIR)/chipset/barometer/barometer_bmp180.o -obj-$(CONFIG_DRIVERS_HDF_SENSOR_HALL) += $(SENSOR_ROOT_DIR)/hall/sensor_hall_driver.o +obj-$(CONFIG_DRIVERS_HDF_SENSOR_HALL) += $(SENSOR_ROOT_DIR)/hall/sensor_hall_driver.o obj-$(CONFIG_DRIVERS_HDF_SENSOR_HALL_AK8789) += $(SENSOR_ROOT_DIR)/chipset/hall/hall_ak8789.o @@ -46,27 +43,27 @@ obj-$(CONFIG_DRIVERS_HDF_SENSOR_MAGNETIC) += $(SENSOR_ROOT_DIR)/magnetic/sensor_ obj-$(CONFIG_DRIVERS_HDF_SENSOR_MAGNETIC_LSM303) += $(SENSOR_ROOT_DIR)/chipset/magnetic/magnetic_lsm303.o -ccflags-y += -Idrivers/hdf/framework/model/sensor/driver/include \ - -Idrivers/hdf/framework/model/sensor/driver/common/include \ - -Idrivers/hdf/framework/model/sensor/driver/chipset/accel \ - -Idrivers/hdf/framework/model/sensor/driver/accel \ - -Idrivers/hdf/framework/model/sensor/driver/als \ - -Idrivers/hdf/framework/model/sensor/driver/chipset/als \ - -Idrivers/hdf/framework/model/sensor/driver/chipset/gyro \ - -Idrivers/hdf/framework/model/sensor/driver/gyro \ - -Idrivers/hdf/framework/model/sensor/driver/barometer \ - -Idrivers/hdf/framework/model/sensor/driver/chipset/barometer \ - -Idrivers/hdf/framework/model/sensor/driver/hall \ - -Idrivers/hdf/framework/model/sensor/driver/chipset/hall \ - -Idrivers/hdf/framework/model/sensor/driver/chipset/magnetic \ - -Idrivers/hdf/framework/model/sensor/driver/magnetic \ - -Idrivers/hdf/framework/model/sensor/driver/proximity \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/khdf/osal/include \ - -Ibounds_checking_function/include +ccflags-y += -I$(srctree)/drivers/hdf/framework/model/sensor/driver/include \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/common/include \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/accel \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/accel \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/als \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/als \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/gyro \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/gyro \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/barometer \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/barometer \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/hall \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/hall \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/chipset/magnetic \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/magnetic \ + -I$(srctree)/drivers/hdf/framework/model/sensor/driver/proximity \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/bounds_checking_function/include diff --git a/model/storage/Makefile b/model/storage/Makefile index 72a5889..3f44503 100644 --- a/model/storage/Makefile +++ b/model/storage/Makefile @@ -15,15 +15,15 @@ obj-$(CONFIG_DRIVERS_HDF_STORAGE) += \ $(STORAGE_ROOT_DIR)/src/common/storage_block.o \ ./storage_block_linux.o -ccflags-y += -Idrivers/hdf/framework/model/storage/include/common \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/support/platform/include/common \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/khdf/osal/include \ - -Ibounds_checking_function/include +ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/storage/include/common \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/support/platform/include/common \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/bounds_checking_function/include diff --git a/model/usb/device/Makefile b/model/usb/device/Makefile index 620103e..e2dac1c 100644 --- a/model/usb/device/Makefile +++ b/model/usb/device/Makefile @@ -2,14 +2,14 @@ obj-$(CONFIG_DRIVERS_HDF_USB_F_GENERIC) += f_generic.o ccflags-y += -lm -lc -lgcc \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/khdf/osal/include \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/config \ - -Ibounds_checking_function/include + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/bounds_checking_function/include diff --git a/model/usb/host/Makefile b/model/usb/host/Makefile index 94843ab..0552bbe 100644 --- a/model/usb/host/Makefile +++ b/model/usb/host/Makefile @@ -14,16 +14,16 @@ obj-$(CONFIG_DRIVERS_HDF_USB_PNP_NOTIFY) += \ $(USB_PNP_NOTIFY_ROOT_DIR)/src/usb_pnp_notify.o ccflags-y += -lm -lc -lgcc \ - -Idrivers/hdf/khdf/model/usb/host/include \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/khdf/osal/include \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/core/shared/include \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/config \ - -Ibounds_checking_function/include + -I$(srctree)/drivers/hdf/khdf/model/usb/host/include \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/core/shared/include \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/bounds_checking_function/include diff --git a/network/src/Makefile b/network/src/Makefile index fa0dcff..e8b18f8 100644 --- a/network/src/Makefile +++ b/network/src/Makefile @@ -15,11 +15,11 @@ obj-$(CONFIG_DRIVERS_HDF_WIFI) += net_device_adapter.o netbuf_adapter.o ccflags-$(CONFIG_DRIVERS_HDF_WIFI) += \ - -Idrivers/hdf/framework/model/network/common/netdevice \ - -Idrivers/hdf/framework/include/net\ - -Idrivers/hdf/khdf/network/include \ - -Idrivers/hdf/khdf/osal/include \ - -Iinclude/hdf/wifi \ - -Iinclude/hdf/utils \ - -Iinclude/hdf/osal \ - -Ibounds_checking_function/include + -I$(srctree)/drivers/hdf/framework/model/network/common/netdevice \ + -I$(srctree)/drivers/hdf/framework/include/net\ + -I$(srctree)/drivers/hdf/khdf/network/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/include/hdf/wifi \ + -I$(srctree)/include/hdf/utils \ + -I$(srctree)/include/hdf/osal \ + -I$(srctree)/bounds_checking_function/include diff --git a/osal/src/Makefile b/osal/src/Makefile index 9dbfae5..3ce1c73 100644 --- a/osal/src/Makefile +++ b/osal/src/Makefile @@ -14,9 +14,9 @@ obj-y += osal_workqueue.o osal_thread.o osal_firmware.o osal_irq.o osal_mem.o osal_mutex.o osal_sem.o osal_spinlock.o \ osal_time.o osal_file.o osal_timer.o osal_cdev.o osal_deal_log_format.o -ccflags-y += -Iinclude/hdf \ - -Iinclude/hdf/osal \ - -Iinclude/hdf/utils \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/khdf/osal/include \ - -Ibounds_checking_function/include +ccflags-y +=-I$(srctree)/include/hdf \ + -I$(srctree)/include/hdf/osal \ + -I$(srctree)/include/hdf/utils \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/bounds_checking_function/include diff --git a/platform/platform.mk b/platform/platform.mk index c75592b..de551c3 100644 --- a/platform/platform.mk +++ b/platform/platform.mk @@ -13,24 +13,24 @@ # HDF_PLATFORM_FRAMEWORKS_ROOT = ../../../../../framework/support/platform -ccflags-$(CONFIG_DRIVERS_HDF_PLATFORM) += -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/support/platform/include \ - -Idrivers/hdf/framework/support/platform/include/mmc \ - -Idrivers/hdf/framework/support/platform/include/common \ - -Idrivers/hdf/framework/model/storage/include/common \ - -Iinclude/hdf \ - -Iinclude/hdf/osal \ - -Iinclude/hdf/utils \ - -Idrivers/hdf/khdf/osal/include \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/khdf/config/include \ - -Idrivers/hdf/framework/core/manager/include \ - -Idrivers/hdf/framework/core/host/include \ - -Idrivers/hdf/framework/core/shared/include \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/utils/include \ - -Ibounds_checking_function/include +ccflags-$(CONFIG_DRIVERS_HDF_PLATFORM) +=-I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/drivers/hdf/framework/support/platform/include \ + -I$(srctree)/drivers/hdf/framework/support/platform/include/mmc \ + -I$(srctree)/drivers/hdf/framework/support/platform/include/common \ + -I$(srctree)/drivers/hdf/framework/model/storage/include/common \ + -I$(srctree)/include/hdf \ + -I$(srctree)/include/hdf/osal \ + -I$(srctree)/include/hdf/utils \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/khdf/config/include \ + -I$(srctree)/drivers/hdf/framework/core/manager/include \ + -I$(srctree)/drivers/hdf/framework/core/host/include \ + -I$(srctree)/drivers/hdf/framework/core/shared/include \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/bounds_checking_function/include diff --git a/test/Makefile b/test/Makefile index d9e44be..5d754e2 100644 --- a/test/Makefile +++ b/test/Makefile @@ -61,33 +61,33 @@ obj-$(CONFIG_DRIVERS_HDF_AUDIO_TEST) += $(HDF_FRAMWORK_TEST_ROOT)/model/audio/sr $(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_sapm_test.o \ $(HDF_FRAMWORK_TEST_ROOT)/model/audio/src/audio_stream_dispatch_test.o -ccflags-y += -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/include/utils \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/utils/include \ - -Idrivers/hdf/framework/include/core \ - -Idrivers/hdf/framework/ability/sbuf/include \ - -Idrivers/hdf/framework/core/host/include \ - -Idrivers/hdf/framework/core/manager/include \ - -Idrivers/hdf/framework/core/shared/include \ - -Idrivers/hdf/framework/core/common/include/host \ - -Idrivers/hdf/framework/core/common/include/manager \ - -Idrivers/hdf/framework/core/adapter/vnode/include \ - -Ibounds_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 \ - -Idrivers/hdf/framework/include/config \ - -Idrivers/hdf/framework/ability/config/hcs_parser/include \ - -Idrivers/hdf/framework/test/unittest/osal \ - -Idrivers/hdf/khdf/osal/include \ - -Idrivers/hdf/framework/model/audio/include \ - -Idrivers/hdf/framework/model/audio/sapm/include \ - -Idrivers/hdf/framework/model/audio/dispatch/include \ - -Idrivers/hdf/framework/test/unittest/model/audio/include \ - -Idrivers/hdf/framework/../peripheral/audio/interfaces/include \ - -Idrivers/hdf/framework/model/audio/dispatch/include \ - -Idrivers/hdf/framework/model/audio/device/codec/include \ - -Idrivers/hdf/framework/model/audio/device/soc/include \ - -Idrivers/hdf/framework/model/audio/device/accessory/include +ccflags-y +=-I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/include/osal \ + -I$(srctree)/drivers/hdf/framework/include/utils \ + -I$(srctree)/drivers/hdf/framework/include \ + -I$(srctree)/drivers/hdf/framework/utils/include \ + -I$(srctree)/drivers/hdf/framework/include/core \ + -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \ + -I$(srctree)/drivers/hdf/framework/core/host/include \ + -I$(srctree)/drivers/hdf/framework/core/manager/include \ + -I$(srctree)/drivers/hdf/framework/core/shared/include \ + -I$(srctree)/drivers/hdf/framework/core/common/include/host \ + -I$(srctree)/drivers/hdf/framework/core/common/include/manager \ + -I$(srctree)/drivers/hdf/framework/core/adapter/vnode/include \ + -I$(srctree)/bounds_checking_function/include \ + -I$(srctree)/drivers/hdf/framework/ability/config/hcs_parser/include \ + -I$(srctree)/drivers/hdf/framework/test/unittest/config \ + -I$(srctree)/drivers/hdf/framework/test/unittest/ability/config/hcs_parser/unittest \ + -I$(srctree)/drivers/hdf/framework/include/config \ + -I$(srctree)/drivers/hdf/framework/ability/config/hcs_parser/include \ + -I$(srctree)/drivers/hdf/framework/test/unittest/osal \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/drivers/hdf/framework/model/audio/include \ + -I$(srctree)/drivers/hdf/framework/model/audio/sapm/include \ + -I$(srctree)/drivers/hdf/framework/model/audio/dispatch/include \ + -I$(srctree)/drivers/hdf/framework/test/unittest/model/audio/include \ + -I$(srctree)/drivers/hdf/framework/../peripheral/audio/interfaces/include \ + -I$(srctree)/drivers/hdf/framework/model/audio/dispatch/include \ + -I$(srctree)/drivers/hdf/framework/model/audio/device/codec/include \ + -I$(srctree)/drivers/hdf/framework/model/audio/device/soc/include \ + -I$(srctree)/drivers/hdf/framework/model/audio/device/accessory/include diff --git a/test/test_khdf.mk b/test/test_khdf.mk index ce59f05..f828fd8 100644 --- a/test/test_khdf.mk +++ b/test/test_khdf.mk @@ -15,56 +15,56 @@ HDF_FRAMEWORK_TEST_ROOT = drivers/hdf/framework/test/unittest HDF_FRAMEWORK_ROOT = drivers/hdf/framework #$(error HDF_FRAMEWORK_ROOT is $(HDF_FRAMEWORK_ROOT)) -ccflags-$(CONFIG_DRIVERS_HDF_TEST) += -Idrivers/hdf/framework/include/platform \ - -I$(HDF_FRAMEWORK_ROOT)/support/platform/include \ - -I$(HDF_FRAMEWORK_ROOT)/support/platform/include/platform \ - -Iinclude/hdf \ - -Iinclude/hdf/osal \ - -Iinclude/hdf/utils \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/common \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/manager \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/osal \ - -Idrivers/hdf/khdf/test/adapter/osal/include \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/osal \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/wifi \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/netdevice \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/module \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/net \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/qos \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/message \ - -Idrivers/hdf/khdf/network/include \ - -Idrivers/hdf/khdf/osal/include \ - -Idrivers/hdf/khdf/test/osal/include \ - -I$(HDF_FRAMEWORK_ROOT)/include \ - -I$(HDF_FRAMEWORK_ROOT)/include/utils \ - -I$(HDF_FRAMEWORK_ROOT)/include/config \ - -Idrivers/hdf/khdf/config/include \ - -I$(HDF_FRAMEWORK_ROOT)/core/manager/include \ - -I$(HDF_FRAMEWORK_ROOT)/core/host/include \ - -I$(HDF_FRAMEWORK_ROOT)/core/shared/include \ - -I$(HDF_FRAMEWORK_ROOT)/include/core \ - -I$(HDF_FRAMEWORK_ROOT)/core/common/include/host \ - -I$(HDF_FRAMEWORK_ROOT)/ability/sbuf/include \ - -I$(HDF_FRAMEWORK_ROOT)/ability/config/hcs_parser/include \ - -I$(HDF_FRAMEWORK_ROOT)/utils/include \ - -I$(HDF_FRAMEWORK_ROOT)/include/wifi \ - -I$(HDF_FRAMEWORK_ROOT)/include/net \ - -I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/include \ - -I$(HDF_FRAMEWORK_ROOT)/model/network/common/netdevice \ - -I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/module \ - -I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/platfrom/src/qos \ - -I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/components/softap \ - -I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/components/sta \ - -I$(HDF_FRAMEWORK_ROOT)/model/network/wifi/platform/include \ - -Ibounds_checking_function/include \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/platform \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/wifi \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/platform/common \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/netdevice \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/module \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/net \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/qos \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/message \ - -I$(HDF_FRAMEWORK_TEST_ROOT)/sensor \ - -I$(HDF_FRAMEWORK_ROOT)/model/sensor/driver/include \ - -I$(HDF_FRAMEWORK_ROOT)/model/sensor/driver/common/include +ccflags-$(CONFIG_DRIVERS_HDF_TEST) +=-I$(srctree)/drivers/hdf/framework/include/platform \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/support/platform/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/support/platform/include/platform \ + -I$(srctree)/include/hdf \ + -I$(srctree)/include/hdf/osal \ + -I$(srctree)/include/hdf/utils \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/common \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/manager \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/osal \ + -I$(srctree)/drivers/hdf/khdf/test/adapter/osal/include \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/osal \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/wifi \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/netdevice \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/module \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/net \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/qos \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/message \ + -I$(srctree)/drivers/hdf/khdf/network/include \ + -I$(srctree)/drivers/hdf/khdf/osal/include \ + -I$(srctree)/drivers/hdf/khdf/test/osal/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/include/utils \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/include/config \ + -I$(srctree)/drivers/hdf/khdf/config/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/core/manager/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/core/host/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/core/shared/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/include/core \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/core/common/include/host \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/ability/sbuf/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/ability/config/hcs_parser/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/utils/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/include/wifi \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/include/net \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/common/netdevice \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/module \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/platfrom/src/qos \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/components/softap \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/core/components/sta \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/network/wifi/platform/include \ + -I$(srctree)/bounds_checking_function/include \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/platform \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/wifi \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/platform/common \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/netdevice \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/module \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/net \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/qos \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/model/network/wifi/unittest/message \ + -I$(srctree)/$(HDF_FRAMEWORK_TEST_ROOT)/sensor \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/sensor/driver/include \ + -I$(srctree)/$(HDF_FRAMEWORK_ROOT)/model/sensor/driver/common/include -- Gitee