Add new embedded target for a super minimal android build (daf5e22d) · Commits · e / os / android_build

core/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -578,7 +578,7 @@ endef
		# Recovery image

		# If neither TARGET_NO_KERNEL nor TARGET_NO_RECOVERY are true
		ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY) $(BUILD_TINY_ANDROID)))
		ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY)))

		INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img

core/binary.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
		endif

		# Add in libcompiler-rt for all regular device builds
		ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(BUILD_TINY_ANDROID))
		ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))
		LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
		endif

core/main.mk

+0 −25

Original line number	Diff line number	Diff line
		@@ -453,25 +453,6 @@ subdirs += build/tools/acp
		endif

		else # !SDK_ONLY
		ifeq ($(BUILD_TINY_ANDROID), true)

		# TINY_ANDROID is a super-minimal build configuration, handy for board
		# bringup and very low level debugging

		subdirs := \
		bionic \
		system/core \
		system/extras/ext4_utils \
		system/extras/su \
		build/libs \
		build/target \
		build/tools/acp \
		external/gcc-demangle \
		external/mksh \
		external/openssl \
		external/yaffs2 \
		external/zlib
		else # !BUILD_TINY_ANDROID
		#
		# Typical build; include any Android.mk files we can find.
		#
		@@ -479,8 +460,6 @@ subdirs := $(TOP)

		FULL_BUILD := true

		endif # !BUILD_TINY_ANDROID

		endif # !SDK_ONLY

		# Before we go and include all of the module makefiles, stash away
		@@ -777,10 +756,6 @@ cacheimage: $(INSTALLED_CACHEIMAGE_TARGET)
		.PHONY: bootimage
		bootimage: $(INSTALLED_BOOTIMAGE_TARGET)

		ifeq ($(BUILD_TINY_ANDROID), true)
		INSTALLED_RECOVERYIMAGE_TARGET :=
		endif

		# Build files and then package it into the rom formats
		.PHONY: droidcore
		droidcore: files \

core/tasks/apicheck.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		# api compatibility or added apis illegally.
		#

		# skip api check for TINY_ANDROID and PDK buid
		ifeq (,$(filter true, $(BUILD_TINY_ANDROID) $(TARGET_BUILD_PDK)))
		# skip api check for PDK buid
		ifeq (,$(filter true, $(WITHOUT_CHECK_API) $(TARGET_BUILD_PDK)))

		.PHONY: checkapi

target/product/base.mk

+2 −43

Original line number	Diff line number	Diff line
		@@ -18,74 +18,46 @@
		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 \
		@@ -102,24 +74,13 @@ PRODUCT_PACKAGES += \
		libstagefright_foundation \
		libstagefright_omx \
		libstagefright_yuv \
		libstdc++ \
		libstlport \
		libsurfaceflinger \
		libsurfaceflinger_client \
		libsurfaceflinger_ddmconnection \
		libsystem_server \
		libsysutils \
		libthread_db \
		libui \
		libusbhost \
		libutils \
		libvisualizer \
		libvorbisidec \
		libwebcore \
		libwpa_client \
		linker \
		logcat \
		logwrapper \
		mediaserver \
		monkey \
		mtpd \
		@@ -135,15 +96,13 @@ PRODUCT_PACKAGES += \
		schedtest \
		screenshot \
		sdcard \
		service \
		servicemanager \
		services \
		settings \
		surfaceflinger \
		svc \
		system_server \
		tc \
		toolbox \
		vdc \
		vold

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