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

Merge "Convert implicit make rules to static pattern rules"

Browse Source
This commit is contained in:
Treehugger Robot
2018-06-16 21:39:52 +00:00
committed by Gerrit Code Review
parent 759a6f75ff 55a8f53068
commit 56ded7fe40
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
build/Android.mk
View File

@@ -3,18 +3,19 @@ LOCAL_PATH := $(call my-dir)
# ===== SDK source.property files ===== # ===== SDK source.property files =====
# Add all files to be generated from the source.prop templates to the SDK pre-requisites # Add all files to be generated from the source.prop templates to the SDK pre-requisites
ALL_SDK_FILES += $(patsubst \ sdk_props := $(patsubst \
$(TOPDIR)development/sdk/%_source.prop_template, \ $(TOPDIR)development/sdk/%_source.prop_template, \
$(HOST_OUT)/development/sdk/%_source.properties, \ $(HOST_OUT)/development/sdk/%_source.properties, \
$(wildcard $(TOPDIR)development/sdk/*_source.prop_template)) \ $(wildcard $(TOPDIR)development/sdk/*_source.prop_template))
$(patsubst \ sample_props := $(patsubst \
$(TOPDIR)development/samples/%_source.prop_template, \ $(TOPDIR)development/samples/%_source.prop_template, \
$(HOST_OUT)/development/samples/%_source.properties, \ $(HOST_OUT)/development/samples/%_source.properties, \
$(wildcard $(TOPDIR)development/samples/*_source.prop_template)) \ $(wildcard $(TOPDIR)development/samples/*_source.prop_template))
$(patsubst \ sys_img_props := $(patsubst \
$(TOPDIR)development/sys-img/%_source.prop_template, \ $(TOPDIR)development/sys-img/%_source.prop_template, \
$(HOST_OUT)/development/sys-img-$(TARGET_CPU_ABI)/%_source.properties, \ $(HOST_OUT)/development/sys-img-$(TARGET_CPU_ABI)/%_source.properties, \
$(wildcard $(TOPDIR)development/sys-img/*_source.prop_template)) $(wildcard $(TOPDIR)development/sys-img/*_source.prop_template))
ALL_SDK_FILES += $(sdk_props) $(sample_props) $(sys_img_props)
# Rule to convert a source.prop template into the desired source.property # Rule to convert a source.prop template into the desired source.property
# This needs to vary based on the CPU ABI for the system-image files. # This needs to vary based on the CPU ABI for the system-image files.
@@ -24,7 +25,7 @@ ALL_SDK_FILES += $(patsubst \
# - ${PLATFORM_VERSION_CODENAME} e.g. "REL" (transformed into "") or "Cupcake" # - ${PLATFORM_VERSION_CODENAME} e.g. "REL" (transformed into "") or "Cupcake"
# - ${TARGET_ARCH} e.g. "arm", "x86", "mips" and their 64-bit variants. # - ${TARGET_ARCH} e.g. "arm", "x86", "mips" and their 64-bit variants.
# - ${TARGET_CPU_ABI} e.g. "armeabi", "x86", "mips" and their 64-bit variants. # - ${TARGET_CPU_ABI} e.g. "armeabi", "x86", "mips" and their 64-bit variants.
$(HOST_OUT)/development/sys-img-$(TARGET_CPU_ABI)/%_source.properties : $(TOPDIR)development/sys-img/%_source.prop_template $(sys_img_props) : $(HOST_OUT)/development/sys-img-$(TARGET_CPU_ABI)/%_source.properties : $(TOPDIR)development/sys-img/%_source.prop_template
@echo Generate $@ @echo Generate $@
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) sed \ $(hide) sed \
@@ -35,7 +36,7 @@ $(HOST_OUT)/development/sys-img-$(TARGET_CPU_ABI)/%_source.properties : $(TOPDIR
-e 's/$${TARGET_CPU_ABI}/$(TARGET_CPU_ABI)/' \ -e 's/$${TARGET_CPU_ABI}/$(TARGET_CPU_ABI)/' \
$< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@ $< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
$(HOST_OUT)/development/sdk/%_source.properties : $(TOPDIR)development/sdk/%_source.prop_template $(sdk_props) : $(HOST_OUT)/development/sdk/%_source.properties : $(TOPDIR)development/sdk/%_source.prop_template
@echo Generate $@ @echo Generate $@
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) sed \ $(hide) sed \
@@ -44,7 +45,7 @@ $(HOST_OUT)/development/sdk/%_source.properties : $(TOPDIR)development/sdk/%_sou
-e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \ -e 's/$${PLATFORM_VERSION_CODENAME}/$(subst REL,,$(PLATFORM_VERSION_CODENAME))/' \
$< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@ $< > $@ && sed -i -e '/^AndroidVersion.CodeName=\s*$$/d' $@
$(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/samples/%_source.prop_template $(sample_props) : $(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR)development/samples/%_source.prop_template
@echo Generate $@ @echo Generate $@
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) sed\ $(hide) sed\