diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-17 08:56:54 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-05-17 08:56:54 -0700 |
| commit | f7fb5331e5635ee5b16ba77170229eb7e59ca5ea (patch) | |
| tree | c5300b5ab04857b3910b1501e3d5a42640519eb7 /media | |
| parent | c7388e3541c9f1d64dd13fc2de49ff77d8993fa5 (diff) | |
| parent | c4fee6330158d1f5e76098feb65eb53b53a3a9b6 (diff) | |
| download | frameworks_base-f7fb5331e5635ee5b16ba77170229eb7e59ca5ea.zip frameworks_base-f7fb5331e5635ee5b16ba77170229eb7e59ca5ea.tar.gz frameworks_base-f7fb5331e5635ee5b16ba77170229eb7e59ca5ea.tar.bz2 | |
merge from open-source master
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
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) \ |