LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix SDK: don't generate empty codename line in source.properties."

Browse Source
This commit is contained in:
Raphael Moll
2012-05-15 13:28:55 -07:00
committed by android code review
parent 66493c9e6a 8707207977
commit d721f0e2c2
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
build/Android.mk
View File

@@ -12,25 +12,25 @@ ALL_SDK_FILES += $(patsubst \
# Rule to convert a source.prop template into the desired source.property # Rule to convert a source.prop template into the desired source.property
# Rewritten variables: # Rewritten variables:
# - ${PLATFORM_VERSION} e.g. "1.0". # - ${PLATFORM_VERSION} e.g. "1.0"
# - ${PLATFORM_SDK_VERSION} e.g. "3", aka the API level. # - ${PLATFORM_SDK_VERSION} e.g. "3", aka the API level
# - ${PLATFORM_VERSION_CODENAME} e.g. "REL" (transformed into "") or "Cupcake". # - ${PLATFORM_VERSION_CODENAME} e.g. "REL" (transformed into "") or "Cupcake"
# - if there's no codename, the codename line is removed. $(HOST_OUT)/development/sdk/%_source.properties : $(TOPDIR)development/sdk/%_source.prop_template
# $1 is the directory to process; all development/$1/*_source.prop_template files will
# be converted.
define convert-source-prop-template
$(HOST_OUT)/development/$(1)/%_source.properties : $(TOPDIR)development/$(1)/%_source.prop_template
@echo Generate $@ @echo Generate $@
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) sed -e 's/$${PLATFORM_VERSION}/$(PLATFORM_VERSION)/' \ $(hide) sed -e 's/$${PLATFORM_VERSION}/$(PLATFORM_VERSION)/' \
-e 's/$${PLATFORM_SDK_VERSION}/$(PLATFORM_SDK_VERSION)/' \ -e 's/$${PLATFORM_SDK_VERSION}/$(PLATFORM_SDK_VERSION)/' \
-e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \ -e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
$< > $@ $< > $@ && sed --in-place -e '/^AndroidVersion.CodeName=\s*$$/d' $@
$(hide) sed --in-place -e '/^AndroidVersion.CodeName=\s*$$/d' $@
endef $(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/samples/%_source.prop_template
@echo Generate $@
$(hide) mkdir -p $(dir $@)
$(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' $@
$(call convert-source-prop-template,sdk)
$(call convert-source-prop-template,samples)
# ===== Android Support/Compatibility Library ===== # ===== Android Support/Compatibility Library =====