Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c07e7b9 authored by Jeff Hamilton's avatar Jeff Hamilton Committed by Android Code Review
Browse files

Merge "Modified libdrm to support SuperH platform"

parents 5b9fb5ab 56cfd668

media/libdrm/mobile2/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ LOCAL_MODULE := libdrm2 


ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-x86)

LOCAL_CFLAGS += -DUSTL_ANDROID_X86

else

  ifeq ($(TARGET_OS)-$(TARGET_ARCH),linux-sh)

  LOCAL_CFLAGS += -DUSTL_ANDROID_SH

  endif

endif



include $(BUILD_STATIC_LIBRARY)

media/libdrm/mobile2/src/util/ustl-1.0/uutility.h

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ namespace simd { 
/// implicit casts to pointer from an integral type. Ironically, such an

/// implicit cast is already detected by gcc.

///

#if defined(USTL_ANDROID_X86)

#if defined(USTL_ANDROID_X86) || defined(USTL_ANDROID_SH)

#define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type)

#else

#define OVERLOAD_POINTER_AND_SIZE_T_V2(name, arg1type)						\