linuxdriver: Roll back Android.mk

Change-Id: If582aa3de83a57ecf7b257066d02d48db0ce8313

1 files changed, 22 insertions, 41 deletions

diff --git a/linuxdriver/Android.mk b/linuxdriver/Android.mk
index 8b96dc2..7ede93d 100644
--- a/linuxdriver/Android.mk
+++ b/linuxdriver/Android.mk
@@ -6,65 +6,46 @@ KERNEL_DIR := kernel/common_3.14
 else
 KERNEL_DIR := common
 endif
-
-ANDROID_ROOT_ABS := $(realpath $(TOP))
+KERNEL_OUT_DIR := out/target/product/$(TARGET_BOOTLOADER_BOARD_NAME)/obj/KERNEL_OBJ
+KERNEL_ARCH := arm64
+PREFIX_CROSS_COMPILE := aarch64-linux-gnu-
+KERNEL_CONFIG=meson64_defconfig
 
 include $(CLEAR_VARS)
+$(info $(shell if [ ! -d $(KERNEL_OUT_DIR) ]; then mkdir -p $(KERNEL_OUT_DIR); fi))
+
+$(info $(shell if [ ! -e $(KERNEL_OUT_DIR)/include/generated/autoconf.h ]; then $(MAKE) -C $(KERNEL_DIR) O=../$(KERNEL_OUT_DIR) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) $(KERNEL_CONFIG); fi))
+
+$(info $(shell if [ ! -e $(KERNEL_OUT_DIR)/include/generated/autoconf.h ]; then $(MAKE) -C $(KERNEL_DIR) O=../$(KERNEL_OUT_DIR) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) modules_prepare; fi))
+
+$(info $(shell $(MAKE) -C $(shell pwd)/$(KERNEL_OUT_DIR) M=$(shell pwd)/vendor/amlogic/tdk/linuxdriver/ ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) modules))
 
-define gen_autoconf
-if [ ! -d $(ANDROID_ROOT_ABS)/$(KERNEL_OUT_DIR) ]; \
-	   then mkdir -p $(ANDROID_ROOT_ABS)/$(KERNEL_OUT_DIR); fi
-if [ ! -e $(ANDROID_ROOT_ABS)/$(KERNEL_OUT_DIR)/include/generated/autoconf.h ];\
-	   then $(MAKE) -C $(ANDROID_ROOT_ABS)/common \
-	   O=$(ANDROID_ROOT_ABS)/$(KERNEL_OUT_DIR) \
-	   ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) \
-	   $(KERNEL_CONFIG); \
-	   fi
-if [ ! -e $(ANDROID_ROOT_ABS)/$(KERNEL_OUT_DIR)/scripts/mod/modpost ]; then \
-	   $(MAKE) -C $(ANDROID_ROOT_ABS)/common \
-	   O=$(ANDROID_ROOT_ABS)/$(KERNEL_OUT_DIR) \
-	   ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) \
-	   modules_prepare; \
-	   fi
-endef
+$(info $(shell mkdir -p $(PRODUCT_OUT)/obj/lib))
+$(info $(shell cp -vf $(LOCAL_PATH)/optee/optee_armtz.ko $(PRODUCT_OUT)/obj/lib))
+$(info $(shell cp -vf $(LOCAL_PATH)/optee.ko $(PRODUCT_OUT)/obj/lib))
+
+armtz_ko_file := $(wildcard $(LOCAL_PATH)/optee/*.ko)
+armtz_ko_file := $(patsubst $(LOCAL_PATH)/optee/%,%,$(armtz_ko_file))
+
+core_ko_file := $(wildcard $(LOCAL_PATH)/*.ko)
+core_ko_file := $(patsubst $(LOCAL_PATH)/%,%,$(core_ko_file))
 
-phony_object := optee.ko
 include $(CLEAR_VARS)
 LOCAL_MODULE := optee_armtz
-LOCAL_PREBUILT_MODULE_FILE := $(LOCAL_PATH)/optee/$(LOCAL_MODULE).ko
+LOCAL_SRC_FILES := optee/$(armtz_ko_file)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_SUFFIX := .ko
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/boot
 LOCAL_STRIP_MODULE := false
-
-$(LOCAL_PREBUILT_MODULE_FILE): $(phony_object)
-
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := optee
-LOCAL_PREBUILT_MODULE_FILE := $(LOCAL_PATH)/$(LOCAL_MODULE).ko
+LOCAL_SRC_FILES := $(core_ko_file)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_SUFFIX := .ko
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/boot
 LOCAL_STRIP_MODULE := false
-
-$(LOCAL_PREBUILT_MODULE_FILE): $(phony_object)
-
 include $(BUILD_PREBUILT)
-
-.PHONY:FORCE
-
-$(phony_object): KERNEL_OUT_DIR := $(PRODUCT_OUT)/obj/KERNEL_OBJ
-$(phony_object): KERNEL_ARCH := arm64
-$(phony_object): PREFIX_CROSS_COMPILE := aarch64-linux-gnu-
-$(phony_object): KERNEL_CONFIG = meson64_defconfig
-$(phony_object): FORCE
-	$(gen_autoconf)
-	$(MAKE) -C $(ANDROID_ROOT_ABS)/$(KERNEL_OUT_DIR) \
-	M=$(ANDROID_ROOT_ABS)/vendor/amlogic/tdk/linuxdriver/ \
-	ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(PREFIX_CROSS_COMPILE) modules
-
-FORCE: