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

Commit a16690c3 authored by Jesse Hall's avatar Jesse Hall
Browse files

Skip unneeded notice files for DATA modules. 

Non-installable generated intermediate data modules can have
notice files attached when they're defined in the same LOCAL_PATH
as the installable module that depends on them. This makes uninstallable
DATA modules silently ignore the fact that the build doesn't know where
to install the notice file.

Bug: 160248517
Test: build
Change-Id: I09a8a253dda52c2d78a1ebc0c33cd96e3505e2e3
Merged-In: I09a8a253dda52c2d78a1ebc0c33cd96e3505e2e3
parent 2f171ac0

core/notice_files.mk

+3 −2
Original line number Diff line number Diff line
@@ -79,8 +79,9 @@ else 
      endif

      module_installed_filename := \

          $(patsubst $(PRODUCT_OUT)/%,%,$($(my_prefix)OUT_JAVA_LIBRARIES))/$(module_leaf)

    else ifeq ($(LOCAL_MODULE_CLASS),ETC)

      # ETC modules may be uninstallable, yet still have a NOTICE file. e.g. apex components

    else ifneq ($(filter ETC DATA,$(LOCAL_MODULE_CLASS)),)

      # ETC and DATA modules may be uninstallable, yet still have a NOTICE file.

      # e.g. apex components

      module_installed_filename :=

    else ifneq (,$(and $(filter %.sdk,$(LOCAL_MODULE)),$(filter $(patsubst %.sdk,%,$(LOCAL_MODULE)),$(SOONG_SDK_VARIANT_MODULES))))

      # Soong produces uninstallable *.sdk shared libraries for embedding in APKs.