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

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

am 0b30c5f0: Merge "Remove linker64 and debuggerd64" 

* commit '0b30c5f0':
  Remove linker64 and debuggerd64
parents fab98ef6 0b30c5f0

core/main.mk

+0 −4
Original line number Original line Diff line number Diff line
@@ -768,10 +768,6 @@ ifdef is_sdk_build 
  $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \

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

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

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

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

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

  ifneq ($(TARGET_IS_64_BIT),true)

    # We know those 64-bit modules don't exist in the 32-bit SDK build.

    dangling_modules := $(filter-out %64,$(dangling_modules))

  endif

  ifneq ($(dangling_modules),)

  ifneq ($(dangling_modules),)

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

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

  endif

  endif

target/product/embedded.mk

+0 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ PRODUCT_PACKAGES += \ 
    adbd \

    adbd \

    bootanimation \

    bootanimation \

    debuggerd \

    debuggerd \

    debuggerd64 \

    dumpstate \

    dumpstate \

    dumpsys \

    dumpsys \

    gralloc.default \

    gralloc.default \
@@ -56,7 +55,6 @@ PRODUCT_PACKAGES += \ 
    libui \

    libui \

    libutils \

    libutils \

    linker \

    linker \

    linker64 \

    logcat \

    logcat \

    logwrapper \

    logwrapper \

    mkshrc \

    mkshrc \