From 55a0d739da34173326c429e3f9a3c1fabdfa5d5e Mon Sep 17 00:00:00 2001 From: Zach Pfeffer Date: Mon, 1 Oct 2012 20:39:13 -0500 Subject: common: Copy build specific HOWTO This commit is the first instance of the LINARO_BUILD_SPEC variable. This var is meant to be set to something like panda-jb-gcc47-tilt-stable-blob. This feature is generally applicable other places and may be able to replace TARGET_PRODUCT. The Makefile changes cover invalid values of this and empty values. In both of these cases a default.xml will be used. Change-Id: Ie1fff4507f0fdaf0474439ab432d207b8366420d Signed-off-by: Zach Pfeffer --- common.mk | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/common.mk b/common.mk index c2d0d33..5c0e85e 100644 --- a/common.mk +++ b/common.mk @@ -68,13 +68,22 @@ V8BENCHMARKS := $(foreach js,$(wildcard $(TOP)/external/v8/benchmarks/*.js),\ PRODUCT_COPY_FILES := \ device/linaro/common/wallpaper_info.xml:data/system/wallpaper_info.xml \ device/linaro/common/disablesuspend.sh:system/bin/disablesuspend.sh \ - $(V8BENCHMARKS) \ - device/linaro/common/howto/panda-jb-gcc47-tilt-stable-blob/HOWTO_prebuilt.txt:howto/panda-jb-gcc47-tilt-stable-blob/HOWTO_prebuilt.txt \ - device/linaro/common/howto/vexpress-rtsm-jb-gcc47-armlt-stable-open/HOWTO_prebuilt.txt:howto/vexpress-rtsm-jb-gcc47-armlt-stable-open/HOWTO_prebuilt.txt \ - device/linaro/common/howto/panda-jb-gcc47-tilt-tracking-blob/HOWTO_prebuilt.txt:howto/panda-jb-gcc47-tilt-tracking-blob/HOWTO_prebuilt.txt \ - device/linaro/common/howto/origen-jb-gcc47-samsunglt-stable-blob/HOWTO_prebuilt.txt:howto/origen-jb-gcc47-samsunglt-stable-blob/HOWTO_prebuilt.txt \ - device/linaro/common/howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_prebuilt.txt:howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_prebuilt.txt \ - device/linaro/common/howto/vexpress-jb-gcc47-armlt-tracking-open/HOWTO_prebuilt.txt:howto/vexpress-jb-gcc47-armlt-tracking-open/HOWTO_prebuilt.txt \ - device/linaro/common/howto/galaxynexus-jb-gcc47-aosp-blob/HOWTO_prebuilt.txt:howto/galaxynexus-jb-gcc47-aosp-blob/HOWTO_prebuilt.txt + $(V8BENCHMARKS) + +# Since Make doesn't do && expressions without a system call hack +# which isn't portible, use a var to record if the var exists and the +# directory exists +NO_LINARO_BUILD_SPEC := true +ifneq ($(strip $(LINARO_BUILD_SPEC)),) +ifneq ($(wildcard $(TOP)/device/linaro/common/howto/$(LINARO_BUILD_SPEC)),) +PRODUCT_COPY_FILES += \ + device/linaro/common/howto/$(LINARO_BUILD_SPEC)/HOWTO_prebuilt.txt:howto/HOWTO_prebuilt.txt$(warning here) +NO_LINARO_BUILD_SPEC := false +endif +endif +ifeq ($(NO_LINARO_BUILD_SPEC),true) +PRODUCT_COPY_FILES += \ + device/linaro/common/howto/default/HOWTO_prebuilt.txt:howto/HOWTO_prebuilt.txt$(warning here2) +endif $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) -- cgit v1.2.3