p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 01bf5684: Merge change 20313 into donut 

Merge commit '01bf5684b448623d7eb054b6d717bb77af05de33'

* commit '01bf5684b448623d7eb054b6d717bb77af05de33':
  add feature to strip "# comment" lines from prebuilt files
This commit is contained in:
Android (Google) Code Review 2009-08-06 16:35:50 -07:00 committed by Android Git Automerger
parent 3513846c0a 01bf5684b4
commit 80f820ca1a
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/definitions.mk
View File

@ -1470,6 +1470,13 @@ define copy-file-to-target-with-cp
$(hide) cp -fp $< $@
endef
# The same as copy-file-to-target, but strip out "# comment"-style
# comments (for config files and such).
define copy-file-to-target-strip-comments
@mkdir -p $(dir $@)
$(hide) sed -e 's/#.*$$//' -e 's/[ \t]*$$//' -e '/^$$/d' < $< > $@
endef
# The same as copy-file-to-target, but don't preserve
# the old modification time.
define copy-file-to-new-target
@ -1490,6 +1497,12 @@ define transform-prebuilt-to-target
$(copy-file-to-target)
endef
# Copy a prebuilt file to a target location, stripping "# comment" comments.
define transform-prebuilt-to-target-strip-comments
@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt: $(PRIVATE_MODULE) ($@)"
$(copy-file-to-target-strip-comments)
endef
###########################################################
## On some platforms (MacOS), after copying a static

8
core/prebuilt.mk
View File

@ -3,7 +3,7 @@
##
## Additional inputs from base_rules.make:
## None.
##
##
###########################################################
ifneq ($(LOCAL_PREBUILT_LIBS),)
@ -26,8 +26,14 @@ else
prebuilt_module_is_a_library :=
endif
ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)
$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES)
$(transform-prebuilt-to-target-strip-comments)
else
$(LOCAL_BUILT_MODULE) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP)
$(transform-prebuilt-to-target)
endif
ifneq ($(prebuilt_module_is_a_library),)
ifneq ($(LOCAL_IS_HOST_MODULE),)
$(transform-host-ranlib-copy-hack)