diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 15 | ||||
| -rw-r--r-- | core/main.mk | 17 | ||||
| -rw-r--r-- | core/tasks/apicheck.mk | 3 |
3 files changed, 27 insertions, 8 deletions
diff --git a/core/Makefile b/core/Makefile index ca2b143..bb18c4b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -618,7 +618,14 @@ recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET) recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery -recovery_resources := $(call include-path-for, recovery)/res +recovery_resources_common := $(call include-path-for, recovery)/res +recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res)) +recovery_resource_deps := $(shell find $(recovery_resources_common) \ + $(recovery_resources_private) -type f) + +ifeq ($(recovery_resources_private),) + $(info No private recovery resources for TARGET_DEVICE $(TARGET_DEVICE)) +endif INTERNAL_RECOVERYIMAGE_ARGS := \ $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \ @@ -636,7 +643,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) \ $(recovery_binary) \ $(recovery_initrc) $(recovery_kernel) \ $(INSTALLED_2NDBOOTLOADER_TARGET) \ - $(recovery_build_prop) + $(recovery_build_prop) $(recovery_resource_deps) @echo ----- Making recovery image ------ rm -rf $(TARGET_RECOVERY_OUT) mkdir -p $(TARGET_RECOVERY_OUT) @@ -648,7 +655,9 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) \ echo Modifying ramdisk contents... cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/ cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/ - cp -rf $(recovery_resources) $(TARGET_RECOVERY_ROOT_OUT)/ + cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/ + $(foreach item,$(recovery_resources_private), \ + cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \ > $(TARGET_RECOVERY_ROOT_OUT)/default.prop $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | gzip > $(recovery_ramdisk) diff --git a/core/main.mk b/core/main.mk index a1374a2..1ea13ac 100644 --- a/core/main.mk +++ b/core/main.mk @@ -313,11 +313,18 @@ ifeq ($(BUILD_TINY_ANDROID), true) INTERNAL_DEFAULT_DOCS_TARGETS := subdirs := \ + bionic \ system/core \ - external/zlib \ - build/tools \ - tools/kcm \ - external/yaffs2 + build/libs \ + build/target \ + build/tools/acp \ + build/tools/apriori \ + build/tools/kcm \ + build/tools/soslim \ + external/elfcopy \ + external/elfutils \ + external/yaffs2 \ + external/zlib else # !BUILD_TINY_ANDROID # @@ -489,7 +496,7 @@ overridden_packages := $(call get-package-overrides,$(modules_to_build)) ifdef overridden_packages # old_modules_to_build := $(modules_to_build) modules_to_build := \ - $(filter-out $(foreach p,$(overridden_packages),%/$(p) %/$(p).apk), \ + $(filter-out $(foreach p,$(overridden_packages),$(p) %/$(p).apk), \ $(modules_to_build)) endif #$(error filtered out $(filter-out $(modules_to_build),$(old_modules_to_build))) diff --git a/core/tasks/apicheck.mk b/core/tasks/apicheck.mk index c4e51c1..044e4af 100644 --- a/core/tasks/apicheck.mk +++ b/core/tasks/apicheck.mk @@ -17,6 +17,8 @@ # api compatibility or added apis illegally. # +ifneq ($(BUILD_TINY_ANDROID), true) + .PHONY: checkapi # eval this to define a rule that runs apicheck. @@ -71,3 +73,4 @@ update-api: $(INTERNAL_PLATFORM_API_FILE) | $(ACP) @echo Copying current.xml $(hide) $(ACP) $(INTERNAL_PLATFORM_API_FILE) $(SRC_API_DIR)/current.xml +endif |