Merge "Generate init.environ.rc by populating BOOTCLASSPATH" (64f923ed) · Commits · e / os / android_system_core

rootdir/Android.mk

+29 −46

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		# files that live under /system/etc/...

		copy_from := \
		etc/hosts


		copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from))
		copy_from := $(addprefix $(LOCAL_PATH)/,$(copy_from))

		$(copy_to) : PRIVATE_MODULE := system_etcdir
		$(copy_to) : $(TARGET_OUT)/% : $(LOCAL_PATH)/% \| $(ACP)
		$(transform-prebuilt-to-target)

		ALL_PREBUILT += $(copy_to)


		# files that live under /...

		#######################################
		# init.rc
		# Only copy init.rc if the target doesn't have its own.
		ifneq ($(TARGET_PROVIDES_INIT_RC),true)
		file := $(TARGET_ROOT_OUT)/init.rc
		$(file) : $(LOCAL_PATH)/init.rc \| $(ACP)
		$(transform-prebuilt-to-target)
		ALL_PREBUILT += $(file)
		$(INSTALLED_RAMDISK_TARGET): $(file)
		endif
		include $(CLEAR_VARS)

		file := $(TARGET_ROOT_OUT)/ueventd.rc
		$(file) : $(LOCAL_PATH)/ueventd.rc \| $(ACP)
		$(transform-prebuilt-to-target)
		ALL_PREBUILT += $(file)
		$(INSTALLED_RAMDISK_TARGET): $(file)
		LOCAL_MODULE := init.rc
		LOCAL_SRC_FILES := $(LOCAL_MODULE)
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

		# init.usb.rc is handled by build/target/product/core.rc
		include $(BUILD_PREBUILT)
		endif
		#######################################
		# init.environ.rc

		include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := ETC
		LOCAL_MODULE := init.environ.rc
		LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)

		# Put it here instead of in init.rc module definition,
		# because init.rc is conditionally included.
		#
		# create some directories (some are mount points)
		DIRS := $(addprefix $(TARGET_ROOT_OUT)/, \
		sbin \
		dev \
		proc \
		sys \
		system \
		data \
		) \
		$(TARGET_OUT_DATA)

		$(DIRS):
		@echo Directory: $@
		@mkdir -p $@

		ALL_PREBUILT += $(DIRS)
		LOCAL_POST_INSTALL_CMD := mkdir -p $(addprefix $(TARGET_ROOT_OUT)/, \
		sbin dev proc sys system data)

		include $(BUILD_SYSTEM)/base_rules.mk

		$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in
		@echo "Generate: $< -> $@"
		@mkdir -p $(dir $@)
		$(hide) sed -e 's?%BOOTCLASSPATH%?$(PRODUCT_BOOTCLASSPATH)?g' $< >$@

		#######################################

rootdir/init.environ.rc.in

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		# set up the global environment
		on init
		export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
		export LD_LIBRARY_PATH /vendor/lib:/system/lib
		export ANDROID_BOOTLOGO 1
		export ANDROID_ROOT /system
		export ANDROID_ASSETS /system/app
		export ANDROID_DATA /data
		export ANDROID_STORAGE /storage
		export ASEC_MOUNTPOINT /mnt/asec
		export LOOP_MOUNTPOINT /mnt/obb
		export BOOTCLASSPATH %BOOTCLASSPATH%

rootdir/init.rc

+1 −12

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		# This is a common source of Android security bugs.
		#

		import /init.environ.rc
		import /init.usb.rc
		import /init.${ro.hardware}.rc
		import /init.trace.rc
		@@ -27,18 +28,6 @@ sysclktz 0

		loglevel 3

		# setup the global environment
		export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
		export LD_LIBRARY_PATH /vendor/lib:/system/lib
		export ANDROID_BOOTLOGO 1
		export ANDROID_ROOT /system
		export ANDROID_ASSETS /system/app
		export ANDROID_DATA /data
		export ANDROID_STORAGE /storage
		export ASEC_MOUNTPOINT /mnt/asec
		export LOOP_MOUNTPOINT /mnt/obb
		export BOOTCLASSPATH /system/framework/core.jar:/system/framework/conscrypt.jar:/system/framework/okhttp.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/framework2.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/mms-common.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar:/system/framework/webviewchromium.jar

		# Backward compatibility
		symlink /system/etc /etc
		symlink /sys/kernel/debug /d