Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87bbe367 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 0192aaed 58386bab

core/clear_vars.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -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:=

core/notice_files.mk

+8 −0
Original line number Original line Diff line number Diff line
@@ -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.