diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 18:25:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:25:01 -0700 |
| commit | 5e6ec733aa694cae952e2e983a04c81a879d9824 (patch) | |
| tree | bdf244697b4d99ee41ab4be9dff77a023ee827fa | |
| parent | d80112bea5c1efe1572bc01e28e60bda6c95eadc (diff) | |
| parent | 468432c09856425b72214e2b6682800bf17f5b22 (diff) | |
| download | omap3-5e6ec733aa694cae952e2e983a04c81a879d9824.tar.gz | |
am 468432c0: Include the framework copy of the OpenMAX headers instead of referencing external/opencore.android-sdk-tools_r12android-sdk-adt_r12
Merge commit '468432c09856425b72214e2b6682800bf17f5b22' into gingerbread-plus-aosp
* commit '468432c09856425b72214e2b6682800bf17f5b22':
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
| -rw-r--r-- | libstagefrighthw/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk index 8d2b73b..9037073 100644 --- a/libstagefrighthw/Android.mk +++ b/libstagefrighthw/Android.mk @@ -9,7 +9,7 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY) LOCAL_C_INCLUDES:= \ - $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \ + $(TOP)/frameworks/base/include/media/stagefright/openmax \ $(TOP)/hardware/ti/omap3/liboverlay LOCAL_SHARED_LIBRARIES := \ |