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

Commit 92967475 authored by Zi Wang's avatar Zi Wang Committed by Gerrit Code Review
Browse files

Merge "Add llndk_libs to PRODUCT_PACKAGES" into main

parents b0c550dc 569b834b

core/main.mk

+0 −1
Original line number Diff line number Diff line
@@ -984,7 +984,6 @@ endef 
# variables being set.

define auto-included-modules

  $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),com.android.vndk.v$(vndk_ver)) \

  $(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES)) \

  llndk.libraries.txt \

  $(if $(DEVICE_MANIFEST_SKUS),$(foreach sku, $(DEVICE_MANIFEST_SKUS),vendor_manifest_$(sku).xml)) \

  $(if $(ODM_MANIFEST_FILES),odm_manifest.xml) \

target/product/base_system.mk

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ PRODUCT_PACKAGES += \ 
    libwilhelm \

    linker \

    llkd \

    llndk_libs \

    lmkd \

    LocalTransport \

    locksettings \

target/product/generic_ramdisk.mk

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ PRODUCT_PACKAGES += \ 
_my_paths := \

    $(TARGET_COPY_OUT_RAMDISK)/ \

    $(TARGET_COPY_OUT_DEBUG_RAMDISK)/ \

    system/usr/share/zoneinfo/tz_version \

    system/usr/share/zoneinfo/tzdata \

    $(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/system \