SDK: don't generate empty codename line in source.properties. DO NOT MERGE.
SDK Bug: b/6490860 Change-Id: I3fbc0b710db891a1649138c8badf4ad88d6e2507
This commit is contained in:
committed by
Raphael Moll
parent
f2bc2a024c
commit
cf3901168b
@@ -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 =====
|
||||
|
||||
Reference in New Issue
Block a user