diff options
| author | David Ng <dave@codeaurora.org> | 2016-04-28 18:56:14 -0700 |
|---|---|---|
| committer | Jeevan Shriram <jshriram@codeaurora.org> | 2016-05-03 15:51:56 -0700 |
| commit | 93cc3fa659146aec142dc2f291bb5804a00f1b0e (patch) | |
| tree | e1a69b960c3cdb637275cc5b360a9e8c43b38697 | |
| parent | c28b11f041412e6e18a8bd26c1e809ac2cdb92d7 (diff) | |
AndroidKernel.mk: Enforce KERNEL_OBJ generation
Always create the KERNEL_OBJ symlink for legacy reference
support when using the new directory style. Earlier the
generation relies on another make target that requires it.
Also solve a minor issue where the make @(hide) was incorrectly
used within a shell command.
Change-Id: Ie1b74b6a3eac563ee34865655b046f71411aca65
Signed-off-by: David Ng <dave@codeaurora.org>
| -rw-r--r-- | AndroidKernel.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/AndroidKernel.mk b/AndroidKernel.mk index 4914401f3fda..b1b28993e325 100644 --- a/AndroidKernel.mk +++ b/AndroidKernel.mk @@ -113,9 +113,11 @@ fi endef ifneq ($(KERNEL_LEGACY_DIR),true) -$(KERNEL_USR): $(TARGET_PREBUILT_INT_KERNEL) +$(KERNEL_USR): $(KERNEL_HEADERS_INSTALL) rm -rf $(KERNEL_SYMLINK) ln -s kernel/$(TARGET_KERNEL) $(KERNEL_SYMLINK) + +$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_USR) endif $(KERNEL_OUT): @@ -139,12 +141,12 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL) $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \ - $(hide) rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \ + rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \ $(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_HEADER_DEFCONFIG); \ $(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) headers_install; fi $(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \ echo "Used a different defconfig for header generation"; \ - $(hide) rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \ + rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG); \ $(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG); fi $(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \ echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \ |