diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-11-04 13:29:36 +0100 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2014-11-04 22:18:05 +0530 |
| commit | 96731384aa925f0e64edaebe027b57d969b96a9d (patch) | |
| tree | 6b9a8051415105676ce029d55321a8fd4ed60976 | |
| parent | 0b08e7f249b811b1d9fe0e5984cbe3c896159117 (diff) | |
Move reference from device/linaro/common to device/linaro/buildlinaro-l
Change-Id: I32ac5c466c61a96c52b41dba678191955bb778dd
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | common.mk | 14 | ||||
| -rw-r--r-- | extra-and-tests.mk | 2 | ||||
| -rw-r--r-- | tasks/bootloader.mk | 2 | ||||
| -rw-r--r-- | tasks/kernel.mk | 2 | ||||
| -rw-r--r-- | tasks/tarballs.mk | 4 |
5 files changed, 12 insertions, 12 deletions
@@ -131,18 +131,18 @@ 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 \ - device/linaro/common/disablesuspend.sh:system/bin/disablesuspend.sh \ + device/linaro/build/wallpaper_info.xml:data/system/wallpaper_info.xml \ + device/linaro/build/disablesuspend.sh:system/bin/disablesuspend.sh \ $(V8BENCHMARKS) define copy-howto -ifneq ($(wildcard $(TOP)/device/linaro/common/howto/$(LINARO_BUILD_SPEC)/$1),) +ifneq ($(wildcard $(TOP)/device/linaro/build/howto/$(LINARO_BUILD_SPEC)/$1),) PRODUCT_COPY_FILES += \ - device/linaro/common/howto/$(LINARO_BUILD_SPEC)/$1:$1 + device/linaro/build/howto/$(LINARO_BUILD_SPEC)/$1:$1 else -ifneq ($(wildcard $(TOP)/device/linaro/common/howto/default/$1),) +ifneq ($(wildcard $(TOP)/device/linaro/build/howto/default/$1),) PRODUCT_COPY_FILES += \ - device/linaro/common/howto/default/$1:$1 + device/linaro/build/howto/default/$1:$1 endif endif endef @@ -155,7 +155,7 @@ HOWTOS := \ HOWTO_rtsm.txt PRODUCT_COPY_FILES += \ - device/linaro/common/media_codecs.xml:system/etc/media_codecs.xml + device/linaro/build/media_codecs.xml:system/etc/media_codecs.xml ifneq ($(wildcard $(TOP)/build-info),) PRODUCT_COPY_FILES += \ diff --git a/extra-and-tests.mk b/extra-and-tests.mk index a85b9b6..da8865e 100644 --- a/extra-and-tests.mk +++ b/extra-and-tests.mk @@ -1,7 +1,7 @@ # similar to common.mk, this file is only for AOSP master based armv8 related build now # in the future will be replaced by common.mk or replace the common.mk -COMMON_EXTRA_TESTS_DIR := device/linaro/common/extra-and-tests/ +COMMON_EXTRA_TESTS_DIR := device/linaro/build/extra-and-tests/ # integrate the ZeroXBenchmark application into the image # http://android.git.linaro.org/git/platform/packages/apps/0xbench diff --git a/tasks/bootloader.mk b/tasks/bootloader.mk index 5938fb4..27cf520 100644 --- a/tasks/bootloader.mk +++ b/tasks/bootloader.mk @@ -64,7 +64,7 @@ ifeq ($(UEFI_TOOLS_PREFIX),) UEFI_TOOLS_DIR = $(realpath $(dir $(TARGET_TOOLS_PREFIX)))/ UEFI_TOOLS_PREFIX = $(UEFI_TOOLS_DIR)$(shell if [ -e $(UEFI_TOOLS_DIR)arm-eabi-gcc ]; then echo arm-eabi-; else echo $(notdir $(TARGET_TOOLS_PREFIX)); fi) endif - +UEFI_TOOLS_PREFIX = arm-eabi- EDK2_OUT_DIR = $(realpath $(PRODUCT_OUT))/obj/uefi EDK2_WORKSPACE = $(realpath $(TOP)/uefi/edk2) diff --git a/tasks/kernel.mk b/tasks/kernel.mk index 3e5ca52..5205383 100644 --- a/tasks/kernel.mk +++ b/tasks/kernel.mk @@ -235,7 +235,7 @@ COMBINED_BOOTTARBALL_TARGET : $(PRODUCT_OUT)/boot/uImage endif REAL_OUT=$(realpath $(PRODUCT_OUT)) -UPDATE_TARBALL := device/linaro/common/tasks/updatetarball.sh +UPDATE_TARBALL := device/linaro/build/tasks/updatetarball.sh define update-boottarball $(hide) echo "Target boot fs tarball: $(INSTALLED_BOOTTARBALL_TARGET)" $(hide) $(UPDATE_TARBALL) $(FS_GET_STATS) $(PRODUCT_OUT) boot $(PRIVATE_BOOT_TAR) \ diff --git a/tasks/tarballs.mk b/tasks/tarballs.mk index 6547230..c973f28 100644 --- a/tasks/tarballs.mk +++ b/tasks/tarballs.mk @@ -2,7 +2,7 @@ # Trigger build of tar balls for the linaro boards # -LINARO_MKTARBALL := device/linaro/common/tasks/mktarball.sh +LINARO_MKTARBALL := device/linaro/build/tasks/mktarball.sh ####### ## root tarball @@ -33,4 +33,4 @@ $(INSTALLED_ROOTTARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_RAMDISK_FILES) endif -roottarball: $(INSTALLED_ROOTTARBALL_TARGET)
\ No newline at end of file +roottarball: $(INSTALLED_ROOTTARBALL_TARGET) |