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
This commit is contained in:
@@ -98,12 +98,14 @@ PRODUCT_PACKAGES += \
|
|||||||
ld.mc \
|
ld.mc \
|
||||||
libaaudio \
|
libaaudio \
|
||||||
libandroid \
|
libandroid \
|
||||||
|
libandroidfw \
|
||||||
libandroid_runtime \
|
libandroid_runtime \
|
||||||
libandroid_servers \
|
libandroid_servers \
|
||||||
libaudioeffect_jni \
|
libaudioeffect_jni \
|
||||||
libaudioflinger \
|
libaudioflinger \
|
||||||
libaudiopolicymanager \
|
libaudiopolicymanager \
|
||||||
libaudiopolicyservice \
|
libaudiopolicyservice \
|
||||||
|
libaudioutils \
|
||||||
libbinder \
|
libbinder \
|
||||||
libc \
|
libc \
|
||||||
libcamera2ndk \
|
libcamera2ndk \
|
||||||
@@ -135,6 +137,7 @@ PRODUCT_PACKAGES += \
|
|||||||
libkeystore \
|
libkeystore \
|
||||||
liblog \
|
liblog \
|
||||||
libm \
|
libm \
|
||||||
|
libmdnssd \
|
||||||
libmedia \
|
libmedia \
|
||||||
libmedia_jni \
|
libmedia_jni \
|
||||||
libmediandk \
|
libmediandk \
|
||||||
@@ -149,6 +152,7 @@ PRODUCT_PACKAGES += \
|
|||||||
libpdfium \
|
libpdfium \
|
||||||
libpixelflinger \
|
libpixelflinger \
|
||||||
libpower \
|
libpower \
|
||||||
|
libpowermanager \
|
||||||
libradio_metadata \
|
libradio_metadata \
|
||||||
librtp_jni \
|
librtp_jni \
|
||||||
libsensorservice \
|
libsensorservice \
|
||||||
@@ -159,6 +163,7 @@ PRODUCT_PACKAGES += \
|
|||||||
libsoundpool \
|
libsoundpool \
|
||||||
libsoundtrigger \
|
libsoundtrigger \
|
||||||
libsoundtriggerservice \
|
libsoundtriggerservice \
|
||||||
|
libspeexresampler \
|
||||||
libsqlite \
|
libsqlite \
|
||||||
libstagefright \
|
libstagefright \
|
||||||
libstagefright_amrnb_common \
|
libstagefright_amrnb_common \
|
||||||
|
@@ -22,13 +22,5 @@ PRODUCT_PACKAGES += \
|
|||||||
Home \
|
Home \
|
||||||
TelephonyProvider \
|
TelephonyProvider \
|
||||||
UserDictionaryProvider \
|
UserDictionaryProvider \
|
||||||
libandroidfw \
|
|
||||||
libaudioutils \
|
|
||||||
libmdnssd \
|
|
||||||
libnfc_ndef \
|
|
||||||
libpowermanager \
|
|
||||||
libspeexresampler \
|
|
||||||
libvariablespeed \
|
|
||||||
libwebrtc_audio_preprocessing \
|
|
||||||
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
|
||||||
|
@@ -56,6 +56,7 @@ PRODUCT_PACKAGES += \
|
|||||||
libstagefright_soft_vorbisdec \
|
libstagefright_soft_vorbisdec \
|
||||||
libstagefright_soft_vpxdec \
|
libstagefright_soft_vpxdec \
|
||||||
libstagefright_soft_vpxenc \
|
libstagefright_soft_vpxenc \
|
||||||
|
libwebrtc_audio_preprocessing \
|
||||||
libwebviewchromium_loader \
|
libwebviewchromium_loader \
|
||||||
libwebviewchromium_plat_support \
|
libwebviewchromium_plat_support \
|
||||||
logd \
|
logd \
|
||||||
|
Reference in New Issue
Block a user