| author | Jiyu Yang <jiyu.yang@amlogic.com> | 2017-04-27 13:02:41 (GMT) |
|---|---|---|
| committer | Jiyu Yang <jiyu.yang@amlogic.com> | 2017-05-10 08:44:08 (GMT) |
| commit | 9b1a4335d055254c6fcbab97ebb9b452ea7db771 (patch) | |
| tree | b58190e086012c548f9e2afeda7c829fe88f133a | |
| parent | 92f2f222b844fb765c67bda02709ab23130d6cf3 (diff) | |
| download | gralloc-9b1a4335d055254c6fcbab97ebb9b452ea7db771.zip gralloc-9b1a4335d055254c6fcbab97ebb9b452ea7db771.tar.gz gralloc-9b1a4335d055254c6fcbab97ebb9b452ea7db771.tar.bz2 | |
PD#142871 fixed gralloc path on Android4.4
Change-Id: I54705854182c5be58bcbbe259807be599a0edce6
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | framebuffer.h | 8 |
2 files changed, 4 insertions, 10 deletions
@@ -81,7 +81,6 @@ ifeq ($(MALI_ARCHITECTURE_UTGARD),1) GRALLOC_DEPTH?=GRALLOC_32_BITS GRALLOC_FB_SWAP_RED_BLUE?=0 MALI_DDK_INCLUDES=$(MALI_LOCAL_PATH)/include $(MALI_LOCAL_PATH)/src/ump/include - LOCAL_MODULE_RELATIVE_PATH := hw ifeq ($(MALI_ION),1) ALLOCATION_LIB := libion ALLOCATOR_SPECIFIC_FILES := alloc_ion.cpp gralloc_module_ion.cpp @@ -96,7 +95,6 @@ else GRALLOC_DEPTH?=GRALLOC_32_BITS GRALLOC_FB_SWAP_RED_BLUE?=0 MALI_DDK_INCLUDES=$(MALI_LOCAL_PATH)/include $(MALI_LOCAL_PATH)/kernel/include - #LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw ifeq ($(MALI_ION),1) ALLOCATION_LIB := libion ALLOCATOR_SPECIFIC_FILES := alloc_ion.cpp gralloc_module_ion.cpp @@ -170,7 +168,11 @@ endif LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64 +ifneq ($(TARGET_2ND_ARCH),) LOCAL_MODULE_RELATIVE_PATH := hw +else +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw +endif ifeq ($(TARGET_BOARD_PLATFORM),) LOCAL_MODULE := gralloc.default else diff --git a/framebuffer.h b/framebuffer.h index a2dbe59..1a229ad 100644 --- a/framebuffer.h +++ b/framebuffer.h @@ -62,14 +62,6 @@ typedef struct hwc_fb_sync_request_t{ unsigned int reserve; } hwc_fb_sync_request_t; -#define ION_IOC_MESON_PHYS_ADDR 8 - -struct meson_phys_data{ - int handle; - unsigned int phys_addr; - unsigned int size; -}; - // Initialize the framebuffer (must keep module lock before calling int init_frame_buffer_locked(struct framebuffer_info_t* info); |