Merge "Split base.mk into system and vendor parts." (6a7add0a) · Commits · e / os / android_build

target/product/base.mk→target/product/base_system.mk

+4 −27

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2012 The Android Open Source Project
		# Copyright (C) 2018 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.
		@@ -14,6 +14,7 @@
		# limitations under the License.
		#

		# Base modules and settings for the system partition.
		PRODUCT_PACKAGES += \
		20-dns.conf \
		95-configured \
		@@ -21,9 +22,6 @@ PRODUCT_PACKAGES += \
		adbd \
		adbd.recovery \
		am \
		android.hardware.cas@1.0-service \
		android.hardware.configstore@1.1-service \
		android.hardware.media.omx@1.0-service \
		android.hidl.allocator@1.0-service \
		android.hidl.base-V1.0-java \
		android.hidl.manager-V1.0-java \
		@@ -77,7 +75,6 @@ PRODUCT_PACKAGES += \
		framework-sysconfig.xml \
		fsck_msdos \
		gatekeeperd \
		gralloc.default \
		healthd \
		hid \
		hwservicemanager \
		@@ -112,23 +109,18 @@ PRODUCT_PACKAGES += \
		libaudiopolicymanager \
		libaudiopolicyservice \
		libbinder \
		libbundlewrapper \
		libc \
		libcamera2ndk \
		libcamera_client \
		libcameraservice \
		libclearkeycasplugin \
		libc_malloc_debug \
		libc_malloc_hooks \
		libcutils \
		libdl \
		libdownmix \
		libdrmclearkeyplugin \
		libdrmframework \
		libdrmframework_jni \
		libdynproc \
		libeffectproxy \
		libeffects \
		libEGL \
		libETC1 \
		libFFTEm \
		@@ -146,7 +138,6 @@ PRODUCT_PACKAGES += \
		libjnigraphics \
		libjpeg \
		libkeystore \
		libldnhncr \
		liblog \
		libm \
		libmedia \
		@@ -164,9 +155,6 @@ PRODUCT_PACKAGES += \
		libpixelflinger \
		libpower \
		libradio_metadata \
		libreference-ril \
		libreverbwrapper \
		libril \
		librtp_jni \
		libsensorservice \
		libsigchain \
		@@ -191,7 +179,6 @@ PRODUCT_PACKAGES += \
		libui \
		libusbhost \
		libutils \
		libvisualizer \
		libvorbisidec \
		libvulkan \
		libwifi-service \
		@@ -243,7 +230,8 @@ PRODUCT_PACKAGES += \
		SettingsProvider \
		sgdisk \
		Shell \
		shell_and_utilities \
		shell_and_utilities_recovery \
		shell_and_utilities_system \
		sm \
		statsd \
		storaged \
		@@ -262,8 +250,6 @@ PRODUCT_PACKAGES += \
		uncrypt \
		usbd \
		vdc \
		vndservice \
		vndservicemanager \
		voip-common \
		vold \
		WallpaperBackup \
		@@ -273,19 +259,10 @@ PRODUCT_PACKAGES += \

		# VINTF data
		PRODUCT_PACKAGES += \
		device_compatibility_matrix.xml \
		device_manifest.xml \
		framework_manifest.xml \
		framework_compatibility_matrix.xml \

		# AID Generation for
		# <pwd.h> and <grp.h>
		PRODUCT_PACKAGES += \
		passwd \
		group \
		fs_config_files \
		fs_config_dirs

		ifeq ($(TARGET_CORE_JARS),)
		$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
		endif

target/product/base_vendor.mk

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2018 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 and settings for the vendor partition.
		PRODUCT_PACKAGES += \
		android.hardware.cas@1.0-service \
		android.hardware.configstore@1.1-service \
		android.hardware.media.omx@1.0-service \
		device_compatibility_matrix.xml \
		fs_config_files \
		fs_config_dirs \
		gralloc.default \
		group \
		libbundlewrapper \
		libclearkeycasplugin \
		libdownmix \
		libeffectproxy \
		libeffects \
		libldnhncr \
		libreference-ril \
		libreverbwrapper \
		libril \
		libvisualizer \
		passwd \
		shell_and_utilities_vendor \
		vndservice \
		vndservicemanager

target/product/core_minimal.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
		ro.logd.size.stats=64K \
		log.tag.stats_log=I

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

		# Enable CFI for security-sensitive components
		$(call inherit-product, $(SRC_TARGET_DIR)/product/cfi-common.mk)