Merge "Fix Mac SDK: sed s/--in-place/-i/"

This commit is contained in:
Raphael Moll
2012-05-15 17:45:52 -07:00
committed by android code review

View File

@@ -21,7 +21,7 @@ $(HOST_OUT)/development/sdk/%_source.properties : $(TOPDIR)development/sdk/%_sou
$(hide) sed -e 's/$${PLATFORM_VERSION}/$(PLATFORM_VERSION)/' \
-e 's/$${PLATFORM_SDK_VERSION}/$(PLATFORM_SDK_VERSION)/' \
-e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
$< > $@ && sed --in-place -e '/^AndroidVersion.CodeName=\s*$$/d' $@
$< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
$(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/samples/%_source.prop_template
@echo Generate $@
@@ -29,7 +29,7 @@ $(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/sampl
$(hide) sed -e 's/$${PLATFORM_VERSION}/$(PLATFORM_VERSION)/' \
-e 's/$${PLATFORM_SDK_VERSION}/$(PLATFORM_SDK_VERSION)/' \
-e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
$< > $@ && sed --in-place -e '/^AndroidVersion.CodeName=\s*$$/d' $@
$< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
# ===== Android Support/Compatibility Library =====