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

resolved conflicts for merge of cf390116 to jb-dev-plus-aosp

Browse Source 
Change-Id: Ia215d78fbeefc59ccd1868fe1365f4260b561e24
This commit is contained in:
Raphael Moll
2012-05-15 20:24:51 -07:00
parent c96a1dae1d cf3901168b
commit 495f0c27a5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/Android.mk
View File

@@ -21,7 +21,7 @@ $(HOST_OUT)/development/sdk/%_source.properties : $(TOPDIR)development/sdk/%_sou
$(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' $@ $< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
$(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/samples/%_source.prop_template $(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/samples/%_source.prop_template
@echo Generate $@ @echo Generate $@
@@ -29,7 +29,7 @@ $(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/sampl
$(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' $@ $< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
# ===== Android Support/Compatibility Library ===== # ===== Android Support/Compatibility Library =====