diff options
| author | Jeff Hamilton <jham@android.com> | 2010-05-14 19:36:40 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-05-14 19:36:40 -0700 |
| commit | 2c07e7b926db2c677b0a1fb9495d663c1aeb79ec (patch) | |
| tree | 4511cabe78d76ca6f999647eada7cd586ca07cd9 /media | |
| parent | 5b9fb5ab7ee81fc9b22f9aaea478db65e9b56c43 (diff) | |
| parent | 56cfd6681aa4e5bb3088a283f10438dd6b746f98 (diff) | |
| download | frameworks_base-2c07e7b926db2c677b0a1fb9495d663c1aeb79ec.zip frameworks_base-2c07e7b926db2c677b0a1fb9495d663c1aeb79ec.tar.gz frameworks_base-2c07e7b926db2c677b0a1fb9495d663c1aeb79ec.tar.bz2 | |
Merge "Modified libdrm to support SuperH platform"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libdrm/mobile2/Android.mk | 4 | ||||
| -rw-r--r-- | media/libdrm/mobile2/src/util/ustl-1.0/uutility.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/media/libdrm/mobile2/Android.mk b/media/libdrm/mobile2/Android.mk index e187139..70c6683 100644 --- a/media/libdrm/mobile2/Android.mk +++ b/media/libdrm/mobile2/Android.mk @@ -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) diff --git a/media/libdrm/mobile2/src/util/ustl-1.0/uutility.h b/media/libdrm/mobile2/src/util/ustl-1.0/uutility.h index 7b5ae64..2ee9a81 100644 --- a/media/libdrm/mobile2/src/util/ustl-1.0/uutility.h +++ b/media/libdrm/mobile2/src/util/ustl-1.0/uutility.h @@ -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) \ |