From 89686538d77c47ed7816594c7597f5d1e456d656 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 16 Dec 2011 11:27:52 -0800 Subject: [PATCH] Support to build factory ramdisk image. Bug: 5769921 With this change, to build factory_ramdisk.img, set PRODUCT_FACTORY_RAMDISK_MODULES in your product config. PRODUCT_FACTORY_RAMDISK_MODULES consists of ":" pairs. is relative to the root of the factory ramdisk output. For example: PRODUCT_FACTORY_RAMDISK_MODULES := \ toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files to the factory ramdisk. Or you can define modules that are specific for the factory ramdisk (with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add the module names to PRODUCT_PACKAGES. Change-Id: I80ff72606415cd74fe6f3bc93020a05d84e45b70 --- core/envsetup.mk | 2 ++ core/main.mk | 4 +++ core/product.mk | 1 + core/tasks/factory_ramdisk.mk | 51 +++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 core/tasks/factory_ramdisk.mk diff --git a/core/envsetup.mk b/core/envsetup.mk index 3509a8c10..74e910032 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -253,6 +253,8 @@ TARGET_INSTALLER_DATA_OUT := $(TARGET_INSTALLER_OUT)/data TARGET_INSTALLER_ROOT_OUT := $(TARGET_INSTALLER_OUT)/root TARGET_INSTALLER_SYSTEM_OUT := $(TARGET_INSTALLER_OUT)/root/system +TARGET_FACTORY_RAMDISK_OUT := $(PRODUCT_OUT)/factory_ramdisk + COMMON_MODULE_CLASSES := TARGET-NOTICE_FILES HOST-NOTICE_FILES HOST-JAVA_LIBRARIES ifeq (,$(strip $(DIST_DIR))) diff --git a/core/main.mk b/core/main.mk index 97d3d7e2f..48639b5ad 100644 --- a/core/main.mk +++ b/core/main.mk @@ -727,6 +727,9 @@ checkbuild: $(modules_to_check) .PHONY: ramdisk ramdisk: $(INSTALLED_RAMDISK_TARGET) +.PHONY: factory_ramdisk +factory_ramdisk: $(INSTALLED_FACTORY_RAMDISK_TARGET) + .PHONY: systemtarball systemtarball: $(INSTALLED_SYSTEMTARBALL_TARGET) @@ -807,6 +810,7 @@ else # TARGET_BUILD_APPS $(BUILT_TARGET_FILES_PACKAGE) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \ + $(INSTALLED_FACTORY_RAMDISK_TARGET) \ ) # Building a full system-- the default is to build droidcore diff --git a/core/product.mk b/core/product.mk index 561003d49..23dc37591 100644 --- a/core/product.mk +++ b/core/product.mk @@ -85,6 +85,7 @@ _product_var_list := \ PRODUCT_DEFAULT_WIFI_CHANNELS \ PRODUCT_DEFAULT_DEV_CERTIFICATE \ PRODUCT_RESTRICT_VENDOR_FILES \ + PRODUCT_FACTORY_RAMDISK_MODULES \ define dump-product diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk new file mode 100644 index 000000000..c4d792cd1 --- /dev/null +++ b/core/tasks/factory_ramdisk.mk @@ -0,0 +1,51 @@ +# +# Copyright (C) 2011 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. +# + +# PRODUCT_FACTORY_RAMDISK_MODULES consists of ":" pairs. +# is relative to TARGET_FACTORY_RAMDISK_OUT. +# For example: +# PRODUCT_FACTORY_RAMDISK_MODULES := \ +# toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb +factory_ramdisk_modules := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_FACTORY_RAMDISK_MODULES)) +ifneq (,$(factory_ramdisk_modules)) +INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES := +$(foreach m, $(factory_ramdisk_modules), \ + $(eval _fr_m_name := $(call word-colon,1,$(m))) \ + $(eval _fr_dest := $(call word-colon,2,$(m))) \ + $(eval _fr_m_built := $(filter $(PRODUCT_OUT)/%, $(ALL_MODULES.$(_fr_m_name).BUILT))) \ + $(if $(_fr_m_built), \ + $(eval _fulldest := $(TARGET_FACTORY_RAMDISK_OUT)/$(_fr_dest)) \ + $(eval $(call copy-one-file,$(_fr_m_built),$(_fulldest))) \ + $(eval INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES += $(_fulldest)), \ + $(error Error: module "$(m)" in PRODUCT_FACTORY_RAMDISK_MODULES is not a target module!) \ + )) +endif + +# Files may also be installed via PRODUCT_COPY_FILES, PRODUCT_PACKAGES etc. +INTERNAL_FACTORY_RAMDISK_FILES := $(filter $(TARGET_FACTORY_RAMDISK_OUT)/%, \ + $(ALL_DEFAULT_INSTALLED_MODULES)) + +ifneq (,$(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES)$(INTERNAL_FACTORY_RAMDISK_FILES)) + +BUILT_FACTORY_RAMDISK_TARGET := $(PRODUCT_OUT)/factory_ramdisk.img + +INSTALLED_FACTORY_RAMDISK_TARGET := $(BUILT_FACTORY_RAMDISK_TARGET) +$(INSTALLED_FACTORY_RAMDISK_TARGET) : $(MKBOOTFS) \ + $(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES) $(INTERNAL_FACTORY_RAMDISK_FILES) | $(MINIGZIP) + $(call pretty,"Target factory ram disk: $@") + $(hide) $(MKBOOTFS) $(TARGET_FACTORY_RAMDISK_OUT) | $(MINIGZIP) > $@ + +endif