diff options
| author | Mike Lockwood <lockwood@google.com> | 2012-03-23 12:58:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-23 12:58:30 -0700 |
| commit | 4ff8608a6ad262a58c99b66522fda313ba3f8f1c (patch) | |
| tree | c7f0bb7f5635d06d50c44538747159596af3ed75 /core | |
| parent | a3f122abb99cfb32500455591debf420516e7215 (diff) | |
| parent | 8f8f0d494e6cd856c6c858d289e4ea2052271e65 (diff) | |
| download | build-4ff8608a6ad262a58c99b66522fda313ba3f8f1c.zip build-4ff8608a6ad262a58c99b66522fda313ba3f8f1c.tar.gz build-4ff8608a6ad262a58c99b66522fda313ba3f8f1c.tar.bz2 | |
Merge "Add build.prop to factory ramdisk"
Diffstat (limited to 'core')
| -rw-r--r-- | core/tasks/factory_ramdisk.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk index 6757194..2cbea87 100644 --- a/core/tasks/factory_ramdisk.mk +++ b/core/tasks/factory_ramdisk.mk @@ -60,6 +60,10 @@ INTERNAL_FACTORY_RAMDISK_FILES := $(filter $(TARGET_FACTORY_RAMDISK_OUT)/%, \ ifneq (,$(INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES)$(INTERNAL_FACTORY_RAMDISK_FILES)) +# These files are made by magic in build/core/Makefile so we need to explicitly include them +$(eval $(call copy-one-file,$(TARGET_OUT)/build.prop,$(TARGET_FACTORY_RAMDISK_OUT)/system/build.prop)) +INTERNAL_FACTORY_RAMDISK_FILES += $(TARGET_FACTORY_RAMDISK_OUT)/system/build.prop + BUILT_FACTORY_RAMDISK_FS := $(PRODUCT_OUT)/factory_ramdisk.gz BUILT_FACTORY_RAMDISK_TARGET := $(PRODUCT_OUT)/factory_ramdisk.img |