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

Commit a7045832 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 62c81f82: Collect NOTICE files for apps_only build. 

* commit '62c81f82':
  Collect NOTICE files for apps_only build.
parents 85418952 62c81f82

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ target_notice_file_html_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz 
tools_notice_file_txt := $(HOST_OUT_INTERMEDIATES)/NOTICE.txt

tools_notice_file_html := $(HOST_OUT_INTERMEDIATES)/NOTICE.html



ifndef TARGET_BUILD_APPS

kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt

pdk_fusion_notice_files := $(filter $(TARGET_OUT_NOTICE_FILES)/%, $(ALL_PDK_FUSION_FILES))
@@ -539,6 +540,7 @@ $(installed_notice_html_gz): $(target_notice_file_html_gz) | $(ACP) 
ifeq ($(ONE_SHOT_MAKEFILE),)

ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_gz)

endif

endif  # TARGET_BUILD_APPS



# The kernel isn't really a module, so to get its module file in there, we

# make the target NOTICE files depend on this particular file too, which will

core/main.mk

+9 −0
Original line number Diff line number Diff line
@@ -836,6 +836,15 @@ apps_only: $(unbundled_build_modules) 


droid: apps_only



# Combine the NOTICE files for a apps_only build

$(eval $(call combine-notice-files, \

    $(target_notice_file_txt), \

    $(target_notice_file_html), \

    "Notices for files for apps:", \

    $(TARGET_OUT_NOTICE_FILES), \

    $(apps_only_installed_files)))





else # TARGET_BUILD_APPS

  $(call dist-for-goals, droidcore, \

    $(INTERNAL_UPDATE_PACKAGE_TARGET) \

core/notice_files.mk

+13 −0
Original line number Diff line number Diff line
@@ -73,6 +73,19 @@ ifdef LOCAL_INSTALLED_MODULE 
$(LOCAL_INSTALLED_MODULE): | $(installed_notice_file)

endif



# To facilitate collecting NOTICE files for apps_only build,

# we install the NOTICE file even if a module gets built but not installed,

# because shared jni libraries won't be installed to the system image.

ifdef TARGET_BUILD_APPS

# for static Java libraries, we don't need to even build LOCAL_BUILT_MODULE,

# but just javalib.jar in the common intermediate dir.

ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)

$(intermediates.COMMON)/javalib.jar : | $(installed_notice_file)

else

$(LOCAL_BUILT_MODULE): | $(installed_notice_file)

endif  # JAVA_LIBRARIES

endif  # TARGET_BUILD_APPS



else

# NOTICE file does not exist

installed_notice_file :=