From cf3901168be8fb78b45cef10e048960650f7b937 Mon Sep 17 00:00:00 2001 From: Raphael Moll Date: Mon, 14 May 2012 20:50:53 -0700 Subject: [PATCH] SDK: don't generate empty codename line in source.properties. DO NOT MERGE. SDK Bug: b/6490860 Change-Id: I3fbc0b710db891a1649138c8badf4ad88d6e2507 --- build/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Android.mk b/build/Android.mk index ddaa33e68..967242790 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -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 -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 -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@ # ===== Android Support/Compatibility Library =====