From e8525339bcca0b88077d46fa1ec260448045bed8 Mon Sep 17 00:00:00 2001 From: Naseer Ahmed Date: Fri, 11 Nov 2011 17:59:42 -0800 Subject: [PATCH] hardware/msm7k: When ION is enabled use the new gralloc Change-Id: Id0644da2aa4d55bed7c6c41a2c6e58e860475274 --- libgralloc-qsd8k/Android.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libgralloc-qsd8k/Android.mk b/libgralloc-qsd8k/Android.mk index 28c6a0c..1157e9f 100644 --- a/libgralloc-qsd8k/Android.mk +++ b/libgralloc-qsd8k/Android.mk @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +ifneq ($(TARGET_USES_ION),true) LOCAL_PATH := $(call my-dir) # HAL module implemenation, not prelinked and stored in @@ -21,7 +21,8 @@ LOCAL_PRELINK_MODULE := false LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_SHARED_LIBRARIES := liblog libcutils libGLESv1_CM libutils -LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include +LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include \ + hardware/qcom/display/libgralloc LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr LOCAL_SRC_FILES := \ allocator.cpp \ @@ -62,3 +63,4 @@ LOCAL_MODULE := libgralloc_qsd8k_host LOCAL_CFLAGS:= -DLOG_TAG=\"gralloc-qsd8k\" include $(BUILD_HOST_STATIC_LIBRARY) endif +endif