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

Commit c0dd0465 authored by Anton Hansson's avatar Anton Hansson
Browse files

Move 6 packages up from core_base.mk 

Also remove two nonexistant packages (libnfc_ndef & libvariablespeed).

The moved packages are already being pulled in by being required by
other included packages in one of its parents (base or core_minimal).

These are the moved packages and their pre-existing deps:
- libmdnssd: by netd in base.mk
- libandroidfw: by 7 packages, many in base.mk
- libaudioutils: by 3 packages, e.g libmedia in base.mk
- libpowermanager: by 3 packages, e.g. libaudioflinger in base.mk
- libspeexresampler: by libaudioutils
- libwebrtc_audio_preprocessing: by libaudiopreprocessing in core_minimal.mk

This change makes core_base.mk very small. It will be deleted in a
followup-CL and its contents inlined in its direct children.

Bug: 80410283
Bug: 7456955
Test: make
Change-Id: I1240ec6adc5b9208effd6fc70892dfbd453a1fba
parent 9b48c522

target/product/base_system.mk

+5 −0
Original line number Diff line number Diff line
@@ -98,12 +98,14 @@ PRODUCT_PACKAGES += \ 
    ld.mc \

    libaaudio \

    libandroid \

    libandroidfw \

    libandroid_runtime \

    libandroid_servers \

    libaudioeffect_jni \

    libaudioflinger \

    libaudiopolicymanager \

    libaudiopolicyservice \

    libaudioutils \

    libbinder \

    libc \

    libcamera2ndk \
@@ -135,6 +137,7 @@ PRODUCT_PACKAGES += \ 
    libkeystore \

    liblog \

    libm \

    libmdnssd \

    libmedia \

    libmedia_jni \

    libmediandk \
@@ -149,6 +152,7 @@ PRODUCT_PACKAGES += \ 
    libpdfium \

    libpixelflinger \

    libpower \

    libpowermanager \

    libradio_metadata \

    librtp_jni \

    libsensorservice \
@@ -159,6 +163,7 @@ PRODUCT_PACKAGES += \ 
    libsoundpool \

    libsoundtrigger \

    libsoundtriggerservice \

    libspeexresampler \

    libsqlite \

    libstagefright \

    libstagefright_amrnb_common \

target/product/core_base.mk

+0 −8
Original line number Diff line number Diff line
@@ -22,13 +22,5 @@ PRODUCT_PACKAGES += \ 
    Home \

    TelephonyProvider \

    UserDictionaryProvider \

    libandroidfw \

    libaudioutils \

    libmdnssd \

    libnfc_ndef \

    libpowermanager \

    libspeexresampler \

    libvariablespeed \

    libwebrtc_audio_preprocessing \



$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)

target/product/core_minimal.mk

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

    libstagefright_soft_vpxdec \

    libstagefright_soft_vpxenc \

    libwebrtc_audio_preprocessing \

    libwebviewchromium_loader \

    libwebviewchromium_plat_support \

    logd \