Merge "Dedupe packages in mk's that inherit core_minimal.mk" into stage-aosp-master (fc277804) · Commits · e / os / android_build

target/product/core_base.mk

+0 −28

Original line number	Original line	Diff line number	Diff line
	@@ -21,44 +21,16 @@ PRODUCT_PROPERTY_OVERRIDES := \
	ro.config.alarm_alert=Alarm_Classic.ogg		ro.config.alarm_alert=Alarm_Classic.ogg

	PRODUCT_PACKAGES += \		PRODUCT_PACKAGES += \
	ContactsProvider \
	DefaultContainerService \
	Home \		Home \
	TelephonyProvider \		TelephonyProvider \
	UserDictionaryProvider \		UserDictionaryProvider \
	libandroidfw \		libandroidfw \
	libaudiopreprocessing \
	libaudioutils \		libaudioutils \
	libfilterpack_imageproc \
	libgabi++ \
	libmdnssd \		libmdnssd \
	libnfc_ndef \		libnfc_ndef \
	libpowermanager \		libpowermanager \
	libspeexresampler \		libspeexresampler \
	libstagefright_soft_aacdec \
	libstagefright_soft_aacenc \
	libstagefright_soft_amrdec \
	libstagefright_soft_amrnbenc \
	libstagefright_soft_amrwbenc \
	libstagefright_soft_avcdec \
	libstagefright_soft_avcenc \
	libstagefright_soft_flacdec \
	libstagefright_soft_flacenc \
	libstagefright_soft_g711dec \
	libstagefright_soft_gsmdec \
	libstagefright_soft_hevcdec \
	libstagefright_soft_mp3dec \
	libstagefright_soft_mpeg2dec \
	libstagefright_soft_mpeg4dec \
	libstagefright_soft_mpeg4enc \
	libstagefright_soft_opusdec \
	libstagefright_soft_rawdec \
	libstagefright_soft_vorbisdec \
	libstagefright_soft_vpxdec \
	libstagefright_soft_vpxenc \
	libvariablespeed \		libvariablespeed \
	libwebrtc_audio_preprocessing \		libwebrtc_audio_preprocessing \
	mdnsd \
	requestsync \

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

target/product/core_minimal.mk

+28 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,22 +28,50 @@ PRODUCT_PACKAGES += \
	com.android.media.remotedisplay \		com.android.media.remotedisplay \
	com.android.media.remotedisplay.xml \		com.android.media.remotedisplay.xml \
	CompanionDeviceManager \		CompanionDeviceManager \
			ContactsProvider \
			DefaultContainerService \
	DownloadProvider \		DownloadProvider \
	drmserver \		drmserver \
	ethernet-service \		ethernet-service \
	HTMLViewer \		HTMLViewer \
	idmap \		idmap \
			libaudiopreprocessing \
	libdownmix \		libdownmix \
	libdrmframework \		libdrmframework \
	libdrmframework_jni \		libdrmframework_jni \
	libfilterfw \		libfilterfw \
			libfilterpack_imageproc \
			libgabi++ \
	libgatekeeper \		libgatekeeper \
	libkeystore \		libkeystore \
	libneuralnetworks \		libneuralnetworks \
			libstagefright_soft_aacdec \
			libstagefright_soft_aacenc \
			libstagefright_soft_amrdec \
			libstagefright_soft_amrnbenc \
			libstagefright_soft_amrwbenc \
			libstagefright_soft_avcdec \
			libstagefright_soft_avcenc \
			libstagefright_soft_flacdec \
			libstagefright_soft_flacenc \
			libstagefright_soft_g711dec \
			libstagefright_soft_gsmdec \
			libstagefright_soft_hevcdec \
			libstagefright_soft_mp3dec \
			libstagefright_soft_mpeg2dec \
			libstagefright_soft_mpeg4dec \
			libstagefright_soft_mpeg4enc \
			libstagefright_soft_opusdec \
			libstagefright_soft_rawdec \
			libstagefright_soft_vorbisdec \
			libstagefright_soft_vpxdec \
			libstagefright_soft_vpxenc \
	libwebviewchromium_loader \		libwebviewchromium_loader \
	libwebviewchromium_plat_support \		libwebviewchromium_plat_support \
			mdnsd \
	MediaProvider \		MediaProvider \
	PackageInstaller \		PackageInstaller \
			requestsync \
	StatementService \		StatementService \
	vndk_snapshot_package \		vndk_snapshot_package \
	webview \		webview \