p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Exclude ndk stubs from notice file list 

There are many references to ndk stub libraries in the third party
notices:

out/soong/ndk/platforms/android-10/arch-arm/usr/lib/libc.so
out/soong/ndk/platforms/android-10/arch-arm/usr/lib/liblog.so
...

These are just stub libraries, and aren't distributed on the device. The
real versions of these libraries will be distributed on the device, and
already have the license information.

So let Soong set LOCAL_NO_NOTICE_FILE to prevent these from appearing.

Bug: 36867708
Test: Diff aosp_arm's system/etc/NOTICE.html.gz file before/after
Change-Id: Ifa3693bde7d3b6b9dc7a83122f9cfa24997fac50
(cherry picked from commit 2be559488d)
This commit is contained in:
Dan Willemsen 2017-04-03 16:06:00 -07:00 committed by Steven Moreland
parent 74e7a2dbeb
commit 58386bab15
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/clear_vars.mk
View File

@ -157,6 +157,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.