diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2013-04-19 15:27:03 +0000 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2013-04-19 15:27:03 +0000 |
| commit | d5c75cbcd2adc5d7d557ffc03c920e83d77761c4 (patch) | |
| tree | 3289a1770c26029fa66a8210e7f27c1f92deab4f | |
| parent | b40f34a5c49a9e769f17f4929415888ad9ec94e4 (diff) | |
tasks/kernel.mk: Fix perf dependency, add support to build kernel_fileslinaro-jb
Change-Id: I454d60c5aceee44f47780379ad66dded4a84d289
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | tasks/kernel.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tasks/kernel.mk b/tasks/kernel.mk index 4934433..898afaa 100644 --- a/tasks/kernel.mk +++ b/tasks/kernel.mk @@ -32,7 +32,7 @@ ifneq ($(strip $(BUILD_TINY_ANDROID)),true) ifneq ($(wildcard $(KERNEL_SRC)/tools/perf/compat-android.h),) INCLUDE_PERF ?= 1 ifeq ($(INCLUDE_PERF),1) - PERF_DEP := $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libelf_intermediates/libelf.a $(TARGET_OUT_SHARED_LIBRARIES)/libc.so + PERF_DEP := $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libelf_intermediates/libelf.a $(PRODUCT_OUT)/obj/lib/crtend_android.o $(PRODUCT_OUT)/obj/lib/crtbegin_dynamic.o $(TARGET_OUT_SHARED_LIBRARIES)/libc.so endif endif endif @@ -75,6 +75,7 @@ ifeq ($(INCLUDE_PERF),1) export PATH=$(KERNEL_COMPILER_PATHS):$(PATH) &&\ cd $(KERNEL_SRC)/tools/perf &&\ mkdir -p $(KERNEL_OUT)/tools/perf &&\ + mkdir -p $(REALTOP)/$(PRODUCT_OUT)/system/bin/ &&\ if [ -e $(ABS_TARGET_TOOLS_PREFIX)ld.bfd ]; then LD=$(ABS_TARGET_TOOLS_PREFIX)ld.bfd; else LD=$(ABS_TARGET_TOOLS_PREFIX)ld; fi && \ $(MAKE) ANDROID_CFLAGS="$(TARGET_EXTRA_CFLAGS) $(LOCAL_CFLAGS) -isystem $(REALTOP)/bionic/libc/include -isystem $(REALTOP)/bionic/libc/kernel/common -isystem $(REALTOP)/bionic/libc/kernel/arch-arm -isystem $(REALTOP)/bionic/libc/arch-arm/include -I$(REALTOP)/external/elfutils/libelf -isystem $(REALTOP)/bionic/libm/include -isystem $(shell dirname $(ABS_TARGET_TOOLS_PREFIX))/../include -I$(KERNEL_OUT)/tools/perf" BASIC_LDFLAGS="-nostdlib -Wl,-dynamic-linker,/system/bin/linker,-z,muldefs$(shell if test $(PLATFORM_SDK_VERSION) -lt 16; then echo -ne ',-T$(REALTOP)/$(BUILD_SYSTEM)/armelf.x'; fi),-z,nocopyreloc,--no-undefined -L$(REALTOP)/$(TARGET_OUT_STATIC_LIBRARIES) -L$(REALTOP)/$(PRODUCT_OUT)/system/lib -L$(REALTOP)/external/elfutils -L$(realpath $(PRODUCT_OUT))/obj/STATIC_LIBRARIES/libelf_intermediates -lpthread -lelf -lm -lc $(REALTOP)/$(TARGET_CRTBEGIN_DYNAMIC_O) $(REALTOP)/$(TARGET_CRTEND_O)" $(KERNEL_VERBOSE) O=$(KERNEL_OUT)/tools/perf/ OUTPUT=$(KERNEL_OUT)/tools/perf/ ARCH=$(ARCH) CROSS_COMPILE=$(ABS_TARGET_TOOLS_PREFIX) LD=$$LD prefix=/system NO_DWARF=1 NO_NEWT=1 NO_LIBPERL=1 NO_LIBPYTHON=1 NO_GTK2=1 NO_STRLCPY=1 WERROR=0 && \ cp -f $(KERNEL_OUT)/tools/perf/perf $(REALTOP)/$(PRODUCT_OUT)/system/bin/ @@ -182,9 +183,11 @@ $(patsubst %,$(KERNEL_OUT)/arch/arm/boot/%,$(DTB_TARGETS)) : all_dtbs endif - $(INSTALLED_BOOTTARBALL_TARGET): $(DTB_INSTALL_TARGETS) +kernel_files : $(INSTALLED_KERNEL_TARGET) $(DTB_INSTALL_TARGETS) $(android_kernel_modules) + cp $(INSTALLED_KERNEL_TARGET) $(PRODUCT_OUT)/boot/ + ifeq ($(TARGET_PRODUCT), vexpress_rtsm) bootwrapper: $(DTB_INSTALL_TARGETS) endif |