Move the old user tagged modules over to base.mk so mini and core both share them. (22273e6c) · Commits · e / os / android_build

target/product/base.mk

0 → 100644

+147 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2012 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.
		#

		# Base modules (will move elsewhere, previously user tagged)
		PRODUCT_PACKAGES += \
		20-dns.conf \
		95-configured \
		adb \
		adbd \
		am \
		android.policy \
		android.test.runner \
		app_process \
		applypatch \
		bmgr \
		bootanimation \
		bugreport \
		content \
		dbus-daemon \
		debuggerd \
		dhcpcd \
		dhcpcd-run-hooks \
		dnsmasq \
		dumpstate \
		dumpsys \
		framework \
		fsck_msdos \
		gralloc.default \
		gzip \
		ime \
		init \
		input \
		javax.obex \
		libEGL \
		libETC1 \
		libFFTEm \
		libGLES_android \
		libGLESv1_CM \
		libGLESv2 \
		libSR_AudioIn \
		libandroid \
		libandroid_runtime \
		libandroid_servers \
		libaudioeffect_jni \
		libaudioflinger \
		libbinder \
		libbundlewrapper \
		libc \
		libcamera_client \
		libcameraservice \
		libchromium_net \
		libctest \
		libcutils \
		libdbus \
		libdl \
		libdrm1 \
		libdrm1_jni \
		libeffects \
		libgui \
		libhardware \
		libhardware_legacy \
		libiprouteutil \
		libjni_latinime \
		libjnigraphics \
		libjpeg \
		liblog \
		libm \
		libmedia \
		libmedia_jni \
		libmediaplayerservice \
		libmtp \
		libnetlink \
		libnetutils \
		libpixelflinger \
		libpower \
		libreference-ril \
		libreverbwrapper \
		libril \
		librtp_jni \
		libsensorservice \
		libskia \
		libsonivox \
		libsoundpool \
		libsqlite \
		libstagefright \
		libstagefright_amrnb_common \
		libstagefright_avc_common \
		libstagefright_enc_common \
		libstagefright_foundation \
		libstagefright_omx \
		libstagefright_yuv \
		libstdc++ \
		libstlport \
		libsurfaceflinger \
		libsurfaceflinger_client \
		libsystem_server \
		libsysutils \
		libthread_db \
		libui \
		libusbhost \
		libutils \
		libvisualizer \
		libvorbisidec \
		libwebcore \
		libwpa_client \
		linker \
		logcat \
		logwrapper \
		mediaserver \
		monkey \
		mtpd \
		ndc \
		netcfg \
		netd \
		ping \
		platform.xml \
		pppd \
		pm \
		racoon \
		run-as \
		schedtest \
		screenshot \
		sdcard \
		service \
		servicemanager \
		services \
		surfaceflinger \
		svc \
		system_server \
		tc \
		toolbox \
		vdc \
		vold

target/product/core.mk

+3 −131

Original line number	Diff line number	Diff line
		@@ -22,137 +22,6 @@ PRODUCT_PROPERTY_OVERRIDES := \
		ro.config.notification_sound=OnTheHunt.ogg \
		ro.config.alarm_alert=Alarm_Classic.ogg

		# Core modules (will move elsewhere, previously user tagged)
		PRODUCT_PACKAGES := \
		20-dns.conf \
		95-configured \
		adb \
		adbd \
		am \
		android.policy \
		android.test.runner \
		app_process \
		applypatch \
		bmgr \
		bootanimation \
		bugreport \
		content \
		dbus-daemon \
		debuggerd \
		dhcpcd \
		dhcpcd-run-hooks \
		dnsmasq \
		dumpstate \
		dumpsys \
		framework \
		fsck_msdos \
		gralloc.default \
		gzip \
		ime \
		init \
		input \
		javax.obex \
		libEGL \
		libETC1 \
		libFFTEm \
		libGLES_android \
		libGLESv1_CM \
		libGLESv2 \
		libSR_AudioIn \
		libandroid \
		libandroid_runtime \
		libandroid_servers \
		libaudioeffect_jni \
		libaudioflinger \
		libbinder \
		libbundlewrapper \
		libc \
		libcamera_client \
		libcameraservice \
		libchromium_net \
		libctest \
		libcutils \
		libdbus \
		libdl \
		libdrm1 \
		libdrm1_jni \
		libeffects \
		libgui \
		libhardware \
		libhardware_legacy \
		libiprouteutil \
		libjni_latinime \
		libjnigraphics \
		libjpeg \
		liblog \
		libm \
		libmedia \
		libmedia_jni \
		libmediaplayerservice \
		libmtp \
		libnetlink \
		libnetutils \
		libpixelflinger \
		libpower \
		libreference-ril \
		libreverbwrapper \
		libril \
		librtp_jni \
		libsensorservice \
		libskia \
		libsonivox \
		libsoundpool \
		libsqlite \
		libstagefright \
		libstagefright_amrnb_common \
		libstagefright_avc_common \
		libstagefright_enc_common \
		libstagefright_foundation \
		libstagefright_omx \
		libstagefright_yuv \
		libstdc++ \
		libstlport \
		libsurfaceflinger \
		libsurfaceflinger_client \
		libsystem_server \
		libsysutils \
		libthread_db \
		libui \
		libusbhost \
		libutils \
		libvisualizer \
		libvorbisidec \
		libwebcore \
		libwpa_client \
		linker \
		logcat \
		logwrapper \
		mediaserver \
		monkey \
		mtpd \
		ndc \
		netcfg \
		netd \
		ping \
		platform.xml \
		pppd \
		pm \
		racoon \
		run-as \
		schedtest \
		screenshot \
		sdcard \
		service \
		servicemanager \
		services \
		surfaceflinger \
		svc \
		system_server \
		tc \
		toolbox \
		vdc \
		vold

		PRODUCT_PACKAGES += \
		ApplicationsProvider \
		BackupRestoreConfirmation \
		@@ -288,3 +157,6 @@ ifeq ($(HAVE_SELINUX),true)
		property_contexts \
		mac_permissions.xml
		endif

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

target/product/mini.mk

+10 −1

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
		ro.config.notification_sound=OnTheHunt.ogg \
		ro.config.alarm_alert=Alarm_Classic.ogg

		# Please keep this list sorted alphabetically
		PRODUCT_PACKAGES += \
		ApplicationsProvider \
		ContactsProvider \
		@@ -63,6 +64,8 @@ PRODUCT_PACKAGES += \
		TelephonyProvider \
		UserDictionaryProvider \
		apache-xml \
		audio \
		bluetoothd \
		bouncycastle \
		bu \
		cacerts \
		@@ -80,6 +83,7 @@ PRODUCT_PACKAGES += \
		dx \
		ext \
		framework-res \
		hciattach \
		hprof-conv \
		icu.dat \
		installd \
		@@ -133,11 +137,15 @@ PRODUCT_PACKAGES += \
		libwebrtc_audio_preprocessing \
		libwilhelm \
		libz \
		lint \
		mdnsd \
		network \
		pand \
		requestsync \
		screencap \
		sdptool \
		sensorservice \
		lint
		wpa_supplicant

		PRODUCT_COPY_FILES += \
		system/core/rootdir/init.usb.rc:root/init.usb.rc \
		@@ -202,6 +210,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
		ro.config.ringtone=Ring_Synth_04.ogg \
		ro.config.notification_sound=pixiedust.ogg

		$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
		$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
		$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
		$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage5.mk)