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

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

am bec954d0: Merge "Clean up dangling module names" 

* commit 'bec954d0':
  Clean up dangling module names
parents 1968f286 bec954d0

core/main.mk

+5 −1
Original line number Diff line number Diff line
@@ -753,9 +753,13 @@ ifdef is_sdk_build 


  # Ensure every module listed in PRODUCT_PACKAGES* gets something installed

  # TODO: Should we do this for all builds and not just the sdk?

  dangling_modules :=

  $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \

    $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\

      $(error $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES has nothing to install!)))

      $(eval dangling_modules += $(m))))

  ifneq ($(dangling_modules),)

    $(error Module names '$(dangling_modules)' in PRODUCT_PACKAGES has nothing to install!)

  endif

  $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG), \

    $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\

      $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_DEBUG has nothing to install!)))

target/product/generic_no_telephony.mk

+1 −7
Original line number Diff line number Diff line
@@ -44,18 +44,12 @@ PRODUCT_PACKAGES := \ 
    SystemUI \

    TeleService \

    CalendarProvider \

    bluetooth-health \

    WallpaperCropper



PRODUCT_PACKAGES += \

    audio \

    clatd \

    clatd.conf \

    dhcpcd.conf \

    network \

    pand \

    pppd \

    sdptool

    pppd



PRODUCT_PACKAGES += \

    librs_jni \