From 9d227151a82723142a2cb920966159ad69eb9f1d Mon Sep 17 00:00:00 2001 From: YOUR_NAME Date: Thu, 20 May 2021 12:28:04 +0000 Subject: [PATCH] =?UTF-8?q?IssueNo=EF=BC=9A#I3S732=20Description:sync=20L2?= =?UTF-8?q?=20input=20and=20display=20to=20L1=20Feature=20or=20Bugfix:Bugf?= =?UTF-8?q?ix=20Binary=20Source:=20No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/display/Makefile | 32 +++++++++++++++++++++----------- model/input/Makefile | 12 +++++++++--- 2 files changed, 30 insertions(+), 14 deletions(-) mode change 100755 => 100644 model/display/Makefile diff --git a/model/display/Makefile b/model/display/Makefile old mode 100755 new mode 100644 index c552946..3d5bda0 --- 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 8eaaa60..698379b 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 -- Gitee