From a83f4a2344f19607721c634d0ae7f00743cffb31 Mon Sep 17 00:00:00 2001 From: gonghui Date: Tue, 18 May 2021 15:35:31 +0800 Subject: [PATCH] sync l2 code to l1 code --- Makefile | 10 ++++++++++ model/input/Makefile | 4 ++-- test/Makefile | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) mode change 100755 => 100644 model/input/Makefile diff --git a/Makefile b/Makefile index a071320..41399ef 100644 --- a/Makefile +++ b/Makefile @@ -18,12 +18,22 @@ obj-$(CONFIG_DRIVERS_HDF) += osal/ obj-$(CONFIG_DRIVERS_HDF) += network/ obj-$(CONFIG_DRIVERS_HDF) += config/ +ifeq ($(TARGET_PRODUCT), Hi3516DV300) +ifeq ($(CONFIG_DRIVERS_HDF_TEST), y) +obj-y += hcs/hdf_test/ +obj-y += test/ +else +obj-$(CONFIG_DRIVERS_HDF) += hcs/ +endif +else ifeq ($(CONFIG_DRIVERS_HDF_TEST), y) obj-y += ../../../../$(PRODUCT_PATH)/config/hdf_test/ obj-y += test/ else obj-$(CONFIG_DRIVERS_HDF) += ../../../../$(PRODUCT_PATH)/config/ endif +endif + obj-$(CONFIG_DRIVERS_HDF) += manager/ obj-$(CONFIG_DRIVERS_HDF_PLATFORM) += platform/ obj-$(CONFIG_DRIVERS_HDF_DISP) += model/display/ diff --git a/model/input/Makefile b/model/input/Makefile old mode 100755 new mode 100644 index 3c87f1f..8eaaa60 --- 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 + -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \ + -I$(PROJECT_ROOT)/third_party/FreeBSD/sys/dev/evdev diff --git a/test/Makefile b/test/Makefile index 1dca9ed..9e460e8 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 \ + -I$(PROJECT_ROOT)/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 \ -- Gitee