summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2012-01-03 15:04:15 +0530
committerVishal Bhoj <vishal.bhoj@linaro.org>2012-01-03 15:04:15 +0530
commit827e0144f921ccd0aaca6e8e16b0b6b10e0d7dd1 (patch)
treeea2e55c31f68cfed40b5eb243a73af9fea4c3726
parent716a640a246194f6dd6e661ca59dba811cece9d9 (diff)
parent08ac3cbad233e38fe54ac07eafe2881e4e55b748 (diff)
Merge branch 'linaro_android_4.0.1' into linaro_android_4.0.3
-rw-r--r--common.mk12
1 files changed, 12 insertions, 0 deletions
diff --git a/common.mk b/common.mk
index cfad5b2..dc7f8c7 100644
--- a/common.mk
+++ b/common.mk
@@ -42,4 +42,16 @@ PRODUCT_PACKAGES := \
librs_jni \
mediaframeworktest
+#packages we are using for benchmarking
+PRODUCT_PACKAGES += \
+ v8shell \
+ skia_bench
+
+V8BENCHMARKS := $(foreach js,$(wildcard $(TOP)/external/v8/benchmarks/*.js),\
+ $(js):data/benchmark/v8/$(notdir $(js)))
+
+PRODUCT_COPY_FILES := \
+ device/linaro/common/wallpaper_info.xml:data/system/wallpaper_info.xml \
+ $(V8BENCHMARKS)
+
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)