diff --git a/model/display/Makefile b/model/display/Makefile old mode 100755 new mode 100644 index c552946012609dfee29400cdf0ee8253028a5a0c..3d5bda0d53b6aa5a094f7ff2356ab4a4ad892af7 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -12,6 +12,12 @@ # # +ifeq ($(TARGET_PRODUCT), Hi3516DV300) +SEC_LIB_SOURCES = memcpy_s.c memmove_s.c memset_s.c securecutil.c secureinput_a.c secureprintoutput_a.c snprintf_s.c sprintf_s.c strcat_s.c strcpy_s.c strncat_s.c strncpy_s.c strtok_s.c vsnprintf_s.c vsprintf_s.c + +PWD:=$(shell pwd) +SEC_OBJECTS:=$(patsubst %.c,%.o,$(SEC_LIB_SOURCES)) +endif DISPLAY_ROOT_DIR = ../../../../../framework/model/display/driver obj-y += \ @@ -28,14 +34,18 @@ 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/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 \ - -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \ - -Idrivers/hdf/framework/include \ - -Idrivers/hdf/framework/include/osal \ - -Idrivers/hdf/framework/include/platform \ - -Idrivers/hdf/framework/include/config + -Iinclude/../drivers/hdf/framework/model/display/driver \ + -Iinclude/../drivers/hdf/framework/include/utils \ + -Iinclude/../drivers/hdf/framework/include/core \ + -Iinclude/../drivers/hdf/framework/core/common/include/host \ + -Iinclude/../drivers/hdf/framework/ability/sbuf/include \ + -Iinclude/../drivers/hdf/framework/include \ + -Iinclude/../drivers/hdf/framework/include/osal \ + -Iinclude/../drivers/hdf/framework/include/platform \ + -Iinclude/../drivers/hdf/framework/include/config \ + -Iinclude/../drivers/hdf/khdf/osal/include +ifeq ($(TARGET_PRODUCT), Hi3516DV300) +ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include +else ifeq ($(TARGET_PRODUCT), hi3516dv300) +ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include +endif diff --git a/model/input/Makefile b/model/input/Makefile index 8eaaa60dd155a42a54064a10303e215331f727dd..698379b2046b0e3ab93342fed05cd10bd9572be1 100644 --- a/model/input/Makefile +++ b/model/input/Makefile @@ -26,7 +26,7 @@ obj-$(CONFIG_DRIVERS_HDF_INPUT) += \ $(INPUT_ROOT_DIR)/event_hub.o \ $(INPUT_ROOT_DIR)/hdf_touch.o \ $(INPUT_ROOT_DIR)/hdf_key.o \ - $(INPUT_ROOT_DIR)/hdf_hid.o + $(INPUT_ROOT_DIR)/hdf_hid_adapter.o obj-$(CONFIG_DRIVERS_HDF_TP_5P5_GT911) += \ $(INPUT_ROOT_DIR)/touchscreen/touch_gt911.o @@ -44,6 +44,12 @@ ccflags-y += -Iinclude/../drivers/hdf/framework/model/input/driver \ -Iinclude/../drivers/hdf/framework/include/config \ -Iinclude/../drivers/hdf/framework/core/host/include \ -Iinclude/../drivers/hdf/framework/core/shared/include \ - -Iinclude/../drivers/hdf/khdf/osal/include \ - -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \ + -Iinclude/../drivers/hdf/framework/utils/include \ + -Iinclude/../drivers/hdf/khdf/osal/include +ifeq ($(TARGET_PRODUCT), Hi3516DV300) +ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \ -I$(PROJECT_ROOT)/third_party/FreeBSD/sys/dev/evdev +else ifeq ($(TARGET_PRODUCT), hi3516dv300) +ccflags-y += -I$(PROJECT_ROOT)/third_party/bounds_checking_function/include \ + -I$(PROJECT_ROOT)/third_party/FreeBSD/sys/dev/evdev +endif