!620 refactor: 清理Makefile冗余项

Merge pull request !620 from Zhaotianyu/0911refactor_makefile

apps/config.mk

@@ -30,7 +30,7 @@
 include $(LITEOSTOPDIR)/config.mk
 
 # common flags config
-BASE_OPTS := -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE $(LITEOS_GCOV_OPTS)
+BASE_OPTS := -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
 
 ASFLAGS   :=
 CFLAGS    := $(LITEOS_COPTS) $(BASE_OPTS) -fPIE

arch/arm/arm/Makefile

@@ -43,8 +43,6 @@ else
 LOCAL_SRCS += src/startup/reset_vector_up.S
 endif
 
-LOCAL_FLAGS := $(LITEOS_GCOV_OPTS)
-
 AS_OBJS_LIBC_FLAGS  = -D__ASSEMBLY__
 # linux style macros
 LINUX_ARCH_$(LOSCFG_ARCH_ARM_V7A) = -D__LINUX_ARM_ARCH__=7
@@ -56,6 +54,6 @@ LINUX_ARCH_$(LOSCFG_ARCH_ARM_V8M) = -D__LINUX_ARM_ARCH__=8
 AS_OBJS_LIBC_FLAGS      += $(LINUX_ARCH_y)
 
 ifeq ($(LOSCFG_GDB), y)
-LOCAL_FLAGS += $(AS_OBJS_LIBC_FLAGS)
+LOCAL_FLAGS := $(AS_OBJS_LIBC_FLAGS)
 endif
 include $(MODULE)

bsd/Makefile

@@ -43,6 +43,4 @@ LOCAL_SRCS += $(wildcard crypto/rijndael/*.c) \
               $(wildcard libkern/*.c)
 endif
 
-LOCAL_FLAGS := $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

bsd/compat/linuxkpi/Makefile

@@ -37,6 +37,4 @@ ifneq ($(LOSCFG_HRTIMER_ENABLE), y)
 LOCAL_SRCS := $(filter-out src/linux_hrtimer.c, $(LOCAL_SRCS))
 endif
 
-LOCAL_FLAGS := $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

bsd/dev/usb/Makefile

@@ -135,6 +135,4 @@ LOCAL_SRCS += $(INPUT_SRC)/uhid.c  \
               $(CORE_SRC)/usb_hid.c
 endif
 
-LOCAL_FLAGS += $(LITEOS_GCOV_OPTS)
-
 include $(HDF_DRIVER)

compat/posix/Makefile

@@ -35,6 +35,6 @@ LOCAL_SRCS :=  $(wildcard src/*.c)
 
 LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/compat/posix/src
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

drivers/block/disk/Makefile

@@ -33,6 +33,4 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS :=  $(wildcard src/*.c)
 
-LOCAL_FLAGS := $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

drivers/char/bch/Makefile

@@ -36,6 +36,6 @@ LOCAL_SRCS :=  $(wildcard $(LITEOSTHIRDPARTY)/NuttX/drivers/bch/*.c)
 LOCAL_INCLUDE := \
 	-I $(LITEOSTHIRDPARTY)/NuttX/drivers/bch
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

drivers/char/trace/Makefile

@@ -35,6 +35,6 @@ LOCAL_SRCS :=  $(wildcard src/*.c)
 
 LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/drivers/char/trace/include
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

drivers/mtd/multi_partition/Makefile

@@ -35,13 +35,12 @@ LOCAL_SRCS :=  $(wildcard src/*.c)
 
 LOCAL_INCLUDE := \
     -I $(LITEOSTOPDIR)/fs/jffs2/include \
-    -I $(LITEOSTOPDIR)/drivers/mtd/multi_partition/include \
     -I $(LITEOSTOPDIR)/../../device/hisilicon/drivers/include/mtd/common/include
 
 ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
 LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash
 endif
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

fs/fat/Makefile

@@ -34,13 +34,9 @@ MODULE_NAME := $(notdir $(shell pwd))
 LOCAL_SRCS := $(wildcard os_adapt/*.c)
 LOCAL_SRCS += $(wildcard $(LITEOSTHIRDPARTY)/FatFs/source/*.c)
 
-LOCAL_INCLUDE := \
-	-I $(LITEOSTHIRDPARTY)/FatFs/source \
-	-I $(LITEOSTOPDIR)/fs/fat/os_adapt \
-	-I $(LITEOSTOPDIR)/fs/fat/virpart/include \
-	-I $(LITEOSTOPDIR)/fs/vfs \
+LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/fs/fat/os_adapt
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)
 

fs/fat/virpart/Makefile

@@ -33,10 +33,8 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS :=  $(wildcard src/*.c)
 
-LOCAL_INCLUDE := \
-	-I $(LITEOSTOPDIR)/fs/fat/virpart/include \
-	-I $(LITEOSTOPDIR)/fs/fat/os_adapt
+LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/fs/fat/os_adapt
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

fs/jffs2/Makefile

@@ -35,10 +35,9 @@ LOCAL_SRCS := $(wildcard src/*.c) \
 		$(wildcard $(LITEOSTHIRDPARTY)/Linux_Kernel/fs/jffs2/*.c)
 LOCAL_INCLUDE := \
 		-I $(LITEOSTOPDIR)/fs/jffs2/include \
-		-I $(LITEOSTOPDIR)/drivers/mtd/multi_partition/include \
 		-I $(LITEOSTHIRDPARTY)/Linux_Kernel/fs/jffs2 \
 		-I $(LITEOSTHIRDPARTY)/Linux_Kernel/fs
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)
 

fs/nfs/Makefile

@@ -33,6 +33,6 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard $(LITEOSTHIRDPARTY)/NuttX/fs/nfs/*.c)
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

fs/proc/Makefile

@@ -33,6 +33,4 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard os_adapt/*.c) $(wildcard src/*.c)
 
-LOCAL_FLAGS := $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)
\ No newline at end of file

fs/ramfs/Makefile

@@ -33,6 +33,4 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard $(LITEOSTHIRDPARTY)/NuttX/fs/tmpfs/*.c)
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

fs/romfs/Makefile

@@ -32,6 +32,4 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard $(LITEOSTHIRDPARTY)/NuttX/fs/romfs/*.c)
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

fs/rootfs/Makefile

@@ -33,14 +33,11 @@ MODULE_NAME := rootfs
 
 LOCAL_SRCS := $(wildcard los_rootfs.c los_bootargs.c)
 
-LOCAL_INCLUDE := \
-    -I $(LITEOSTOPDIR)/kernel/common \
-
 ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
 LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash
 endif
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)
 

fs/vfs/Makefile

@@ -95,19 +95,10 @@ $(LITEOSTHIRDPARTY)/NuttX/fs/driver/fs_unregisterdriver.c \
 $(wildcard vfs_cmd/*.c)
 
 LOCAL_INCLUDE := \
-	-I $(LITEOSTOPDIR)/fs/vfs/include \
-	-I $(LITEOSTOPDIR)/fs/vfs/include/bcache\
-	-I $(LITEOSTOPDIR)/drivers/block/disk/include\
 	-I $(LITEOSTOPDIR)/drivers/char/bch/include\
-	-I $(LITEOSTOPDIR)/drivers/mtd/multi_partition/include\
-	-I $(LITEOSTOPDIR)/fs/vfs/include/operation\
 	-I $(LITEOSTOPDIR)/syscall\
 	-I $(LITEOSTOPDIR)/fs/zpfs/include
 
-ifeq ($(LOSCFG_FS_FAT), y)
-LOCAL_INCLUDE += -I $(LITEOSTHIRDPARTY)/FatFs/source
-endif
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

fs/vfs/bcache/Makefile

@@ -33,10 +33,5 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS :=  $(wildcard src/*.c)
 
-LOCAL_INCLUDE := \
-    -I $(LITEOSTHIRDPARTY)/FatFs/source
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)
 

fs/zpfs/Makefile

@@ -35,6 +35,6 @@ LOCAL_SRCS := $(wildcard src/*.c)
 LOCAL_INCLUDE := \
 		-I $(LITEOSTOPDIR)/fs/zpfs/include
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

kernel/base/Makefile

@@ -40,12 +40,6 @@ LOCAL_SRCS := 	$(wildcard ipc/*.c) $(wildcard core/*.c) $(wildcard mem/membox/*.
 		$(wildcard sched/sched_sq/*.c) \
 		$(wildcard vm/*.c)
 
-LOCAL_INCLUDE := \
-	-I $(LITEOSTOPDIR)/kernel/base/include \
-	-I $(LITEOSTOPDIR)/kernel/extended/include \
-	-I $(LITEOSTOPDIR)/kernel/base/mem \
-	-I $(LITEOSTOPDIR)/kernel/base/vm
-
-LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK) $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK)
 
 include $(MODULE)

kernel/common/Makefile

@@ -41,6 +41,6 @@ ifneq ($(LOSCFG_FS_VFS), y)
 LOCAL_SRCS := $(filter-out console.c virtual_serial.c, $(LOCAL_SRCS))
 endif
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

kernel/extended/blackbox/Makefile

@@ -4,12 +4,8 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard *.c)
 
-LOCAL_INCLUDE := \
-        -I $(LITEOSTOPDIR)/kernel/common \
-        -I $(LITEOSTOPDIR)/kernel/common/blackbox \
-        -I $(LITEOSTOPDIR)/syscall \
-        -I $(LITEOSTOPDIR)/kernel/base/include
+LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/syscall
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

kernel/extended/cppsupport/Makefile

@@ -35,9 +35,6 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard *.c)
 
-LOCAL_INCLUDE := \
-	-I $(LITEOSTOPDIR)/kernel/base/include -I $(LITEOSTOPDIR)/kernel/extended/include
-
-LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK) $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK)
 
 include $(MODULE)

kernel/extended/cpup/Makefile

@@ -33,9 +33,4 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard *.c)
 
-LOCAL_INCLUDE := \
-	-I $(LITEOSTOPDIR)/kernel/base/include -I $(LITEOSTOPDIR)/kernel/extended/include
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

kernel/extended/dynload/Makefile

@@ -33,10 +33,6 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard src/*.c)
 
-LOCAL_INCLUDE := \
-        -I $(LITEOSTOPDIR)/kernel/base/include \
-        -I $(LITEOSTOPDIR)/fs/include
-
-LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK) $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK)
 
 include $(MODULE)

kernel/extended/hidumper/Makefile

@@ -4,10 +4,4 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard *.c)
 
-LOCAL_INCLUDE := \
-        -I $(LITEOSTOPDIR)/kernel/common \
-        -I $(LITEOSTOPDIR)/kernel/common/hidumper \
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

kernel/extended/hilog/Makefile

@@ -33,8 +33,6 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard *.c)
 
-LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/kernel/base/include
-
-LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK) $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK)
 
 include $(MODULE)

kernel/extended/liteipc/Makefile

@@ -30,8 +30,6 @@ include $(LITEOSTOPDIR)/config.mk
 
 MODULE_NAME := $(notdir $(shell pwd))
 
-ifeq ($(LOSCFG_KERNEL_LITEIPC), y)
-    LOCAL_SRCS += $(wildcard ./*.c)
-endif
+LOCAL_SRCS := $(wildcard ./*.c)
 
 include $(MODULE)

kernel/extended/pipes

-../../../../third_party/NuttX/drivers/pipes
\ No newline at end of file

kernel/extended/pipes/BUILD.gn

+# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of
+#    conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list
+#    of conditions and the following disclaimer in the documentation and/or other materials
+#    provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be used
+#    to endorse or promote products derived from this software without specific prior written
+#    permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import("//kernel/liteos_a/liteos.gni")
+
+module_switch = defined(LOSCFG_KERNEL_PIPE)
+module_name = get_path_info(rebase_path("."), "name")
+kernel_module(module_name) {
+  sources = [
+    "//third_party/NuttX/drivers/pipes/fifo.c",
+    "//third_party/NuttX/drivers/pipes/pipe.c",
+    "//third_party/NuttX/drivers/pipes/pipe_common.c",
+  ]
+
+  public_configs = [ ":public" ]
+}
+
+config("public") {
+  include_dirs = [ "//third_party/NuttX/drivers/pipes" ]
+}

kernel/extended/pipes/Makefile

+# Copyright (c) 2013-2019, Huawei Technologies Co., Ltd. All rights reserved.
+# Copyright (c) 2020, Huawei Device Co., Ltd. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of
+#    conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list
+#    of conditions and the following disclaimer in the documentation and/or other materials
+#    provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be used
+#    to endorse or promote products derived from this software without specific prior written
+#    permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+include $(LITEOSTOPDIR)/config.mk
+
+MODULE_NAME := $(notdir $(shell pwd))
+
+LOCAL_DIR := $(LITEOSTOPDIR)/../../third_party/NuttX/drivers/pipes
+
+LOCAL_SRCS := $(wildcard $(LOCAL_DIR)/*.c)
+
+include $(MODULE)

kernel/extended/power/Makefile

@@ -33,10 +33,4 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard *.c)
 
-LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/kernel/base/include \
-                 -I $(LITEOSTOPDIR)/kernel/extended/include \
-                 -I $(LITEOSTOPDIR)/arch/arm/include
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

kernel/extended/trace/Makefile

@@ -56,7 +56,7 @@ LOCAL_SRCS += $(wildcard pipeline/serial/*.c)
 LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/kernel/extended/trace/pipeline/serial
 endif
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)
 

kernel/extended/vdso/src/Makefile

@@ -33,8 +33,6 @@ MODULE_NAME := $(notdir $(shell pwd)/../vdso)
 
 LOCAL_SRCS := $(wildcard *.c) $(wildcard *.S)
 
-LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/kernel/base/include -I ../include
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE) -DOHOS_VDSO_SO=\"$(OUT)/lib/OHOS-vdso.so\"
+LOCAL_FLAGS := -DOHOS_VDSO_SO=\"$(OUT)/lib/OHOS-vdso.so\"
 
 include $(MODULE)
\ No newline at end of file

lib/libc/Makefile

@@ -49,12 +49,11 @@ endif
 
 LOCAL_INCLUDE := \
 	-I $(LITEOSTOPDIR)/syscall \
-	-I $(LITEOSTOPDIR)/bsd/dev/random \
-	-I $(LITEOSTOPDIR)/bsd/compat/linuxkpi/include
+	-I $(LITEOSTOPDIR)/bsd/dev/random
 
 LOCAL_INCLUDE += $(addprefix -I$(MUSLPORTINGDIR)/, src/include src/internal)
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS) $(LOCAL_CMACRO)
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LOCAL_CMACRO)
 ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
 LOCAL_FLAGS +=-Wno-char-subscripts -Wno-unknown-pragmas
 else

lib/libscrew/Makefile

@@ -6,10 +6,4 @@ LOCAL_SRCS  := \
         $(wildcard src/*.c) \
         $(LITEOSTOPDIR)/../../third_party/FreeBSD/sys/libkern/crc32.c
 
-LOCAL_INCLUDE := \
-        -I $(LITEOSTOPDIR)/kernel/include \
-        -I $(LITEOSTOPDIR)/lib/libscrew/include \
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

security/Makefile

@@ -43,6 +43,6 @@ LOCAL_SRCS += $(wildcard vid/*.c)
 LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/security/vid
 endif
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

security/cap/Makefile

@@ -33,9 +33,4 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard *.c)
 
-LOCAL_INCLUDE := \
-	-I $(LITEOSTOPDIR)/security/cap
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
-
 include $(MODULE)

shell/Makefile

@@ -35,13 +35,10 @@ ifeq ($(LOSCFG_SHELL), y)
 LOCAL_SRCS := $(wildcard full/src/base/*.c) $(wildcard full/src/cmds/*.c)
 LOCAL_INCLUDE := \
 	-I $(LITEOSTOPDIR)/fs/nfs \
-	-I $(LITEOSTOPDIR)/shell/full/include \
-	-I $(LITEOSTOPDIR)/fs/ramfs \
-	-I $(LITEOSTOPDIR)/fs/fat \
-	-I $(LITEOSTOPDIR)/kernel/base/include \
+	-I $(LITEOSTOPDIR)/fs/ramfs
 
 endif
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

syscall/Makefile

@@ -37,10 +37,4 @@ ifneq ($(LOSCFG_NET_LWIP_SACK), y)
 LOCAL_SRCS := $(filter-out net_syscall.c, $(LOCAL_SRCS))
 endif
 
-LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/kernel/base/include \
-                 -I $(LITEOSTOPDIR)/kernel/extended/dynload/include \
-                 -I $(LITEOSTOPDIR)/fs/include \
-                 -I $(LITEOSTOPDIR)/compat/posix/include \
-                 -I $(LITEOSTOPDIR)/bsd/compat/linuxkpi/include \
-                 -I $(LITEOSTOPDIR)/../../third_party/musl/kernel/include
 include $(MODULE)

tools/build/mk/los_config.mk

@@ -166,7 +166,7 @@ endif
 ifeq ($(LOSCFG_KERNEL_PIPE), y)
     LITEOS_BASELIB     += -lpipes
     LIB_SUBDIRS           += kernel/extended/pipes
-    LITEOS_PIPE_INCLUDE   += -I $(LITEOSTOPDIR)/kernel/extended/pipes
+    LITEOS_PIPE_INCLUDE   += -I $(LITEOSTOPDIR)/../../third_party/NuttX/drivers/pipes
 endif
 
 ifeq ($(LOSCFG_KERNEL_PM), y)
@@ -241,7 +241,6 @@ endif
                             -I $(LITEOSTOPDIR)/fs/vfs/include
     LITEOS_VFS_INCLUDE   += -I $(LITEOSTOPDIR)/fs/vfs/include/operation
     LITEOS_VFS_MTD_INCLUDE := -I $(LITEOSTOPDIR)/drivers/mtd/multi_partition/include
-    LITEOS_VFS_DISK_INCLUDE := -I $(LITEOSTOPDIR)/drivers/block/disk/include
 endif
 
 ifeq ($(LOSCFG_FS_FAT), y)
@@ -259,6 +258,7 @@ endif
 ifeq ($(LOSCFG_FS_FAT_DISK), y)
     LITEOS_BASELIB += -ldisk
     LIB_SUBDIRS += $(LITEOSTOPDIR)/drivers/block/disk
+    LITEOS_VFS_DISK_INCLUDE := -I $(LITEOSTOPDIR)/drivers/block/disk/include
 endif
 
 ifeq ($(LOSCFG_FS_FAT_CACHE), y)