diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 13:31:29 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-10-15 13:31:29 -0700 |
| commit | a4f391c9bf581af19d6dec4603c194126995b6bf (patch) | |
| tree | 03abfd937868de40863a4a5ffc6c8a4dd7bd58c4 /media/libstagefright/omx | |
| parent | 6ac35f059726cf60a364c1efd783a99c901f2d9d (diff) | |
| download | frameworks_base-a4f391c9bf581af19d6dec4603c194126995b6bf.zip frameworks_base-a4f391c9bf581af19d6dec4603c194126995b6bf.tar.gz frameworks_base-a4f391c9bf581af19d6dec4603c194126995b6bf.tar.bz2 | |
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
Diffstat (limited to 'media/libstagefright/omx')
| -rw-r--r-- | media/libstagefright/omx/Android.mk | 4 | ||||
| -rw-r--r-- | media/libstagefright/omx/tests/Android.mk | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk index f4f5cc1..ead1675 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -1,10 +1,12 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +ifneq ($(BUILD_WITHOUT_PV),true) # Set up the OpenCore variables. include external/opencore/Config.mk LOCAL_C_INCLUDES := $(PV_INCLUDES) LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY) +endif LOCAL_C_INCLUDES += $(JNI_H_INCLUDE) @@ -21,6 +23,8 @@ else LOCAL_CFLAGS += -DNO_OPENCORE endif +LOCAL_C_INCLUDES += $(TOP)/frameworks/base/include/media/stagefright/openmax + LOCAL_SHARED_LIBRARIES := \ libbinder \ libmedia \ diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk index 8bf4336..bf69428 100644 --- a/media/libstagefright/omx/tests/Android.mk +++ b/media/libstagefright/omx/tests/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include + $(TOP)/frameworks/base/include/media/stagefright/openmax LOCAL_MODULE:= omx_tests |