StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Exclude ndk stubs from notice file list" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-05 22:42:16 +00:00
committed by Android (Google) Code Review
parent 0192aaedad 58386bab15
commit 87bbe36728
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@@ -158,6 +158,7 @@ LOCAL_NO_DEFAULT_COMPILER_FLAGS:=
LOCAL_NO_FPIE := LOCAL_NO_FPIE :=
LOCAL_NO_LIBCOMPILER_RT:= LOCAL_NO_LIBCOMPILER_RT:=
LOCAL_NO_LIBGCC:= LOCAL_NO_LIBGCC:=
LOCAL_NO_NOTICE_FILE:=
LOCAL_NO_PIC:= LOCAL_NO_PIC:=
LOCAL_NOSANITIZE:= LOCAL_NOSANITIZE:=
LOCAL_NO_STANDARD_LIBRARIES:= LOCAL_NO_STANDARD_LIBRARIES:=

8
core/notice_files.mk
View File

@@ -14,6 +14,14 @@ ifeq ($(LOCAL_MODULE_CLASS),GYP)
notice_file := notice_file :=
endif endif
# Soong generates stub libraries that don't need NOTICE files
ifdef LOCAL_NO_NOTICE_FILE
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
$(call pretty-error,LOCAL_NO_NOTICE_FILE should not be used by Android.mk files)
endif
notice_file :=
endif
ifeq ($(LOCAL_MODULE_CLASS),NOTICE_FILES) ifeq ($(LOCAL_MODULE_CLASS),NOTICE_FILES)
# If this is a NOTICE-only module, we don't include base_rule.mk, # If this is a NOTICE-only module, we don't include base_rule.mk,
# so my_prefix is not set at this point. # so my_prefix is not set at this point.