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

Commit 91a9483e authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Revert "Reuse license metadata files from Soong""

parents 01e02236 81b16769

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ LOCAL_SOONG_INSTALL_PAIRS := 
LOCAL_SOONG_INSTALL_SYMLINKS :=

LOCAL_SOONG_INSTALLED_MODULE :=

LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=

LOCAL_SOONG_LICENSE_METADATA :=

LOCAL_SOONG_LINK_TYPE :=

LOCAL_SOONG_LINT_REPORTS :=

LOCAL_SOONG_PROGUARD_DICT :=

core/notice_files.mk

+10 −17
Original line number Diff line number Diff line
@@ -136,12 +136,6 @@ ifdef my_register_name 


  ALL_MODULES.$(my_register_name).META_LIC := $(strip $(ALL_MODULES.$(my_register_name).META_LIC) $(module_license_metadata))



  ifdef LOCAL_SOONG_LICENSE_METADATA

    # Soong modules have already produced a license metadata file, copy it to where Make expects it.

    $(eval $(call copy-one-file, $(LOCAL_SOONG_LICENSE_METADATA), $(module_license_metadata)))

  else

    # Make modules don't have enough information to produce a license metadata rule until after fix-notice-deps

    # has been called, store the necessary information until later.

  ALL_MODULES.$(my_register_name).DELAYED_META_LIC := $(strip $(ALL_MODULES.$(my_register_name).DELAYED_META_LIC) $(module_license_metadata))

  ALL_MODULES.$(my_register_name).LICENSE_PACKAGE_NAME := $(strip $(license_package_name))

  ALL_MODULES.$(my_register_name).MODULE_TYPE := $(strip $(ALL_MODULES.$(my_register_name).MODULE_TYPE) $(LOCAL_MODULE_TYPE))
@@ -153,7 +147,6 @@ ifdef my_register_name 
  ALL_MODULES.$(my_register_name).IS_CONTAINER := $(strip $(filter-out false,$(ALL_MODULES.$(my_register_name).IS_CONTAINER) $(is_container)))

  ALL_MODULES.$(my_register_name).PATH := $(strip $(ALL_MODULES.$(my_register_name).PATH) $(local_path))

endif

endif



ifdef notice_file