diff options
| author | James Dong <jdong@google.com> | 2012-03-13 12:44:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-13 12:44:54 -0700 |
| commit | 5e7616cc0e5493241211333134555d74aec89982 (patch) | |
| tree | e2a972018a13cbf8c2ad6c3d7592dbbb73fec3a8 /cmds/stagefright | |
| parent | e53b9ead781c36e96d6b6f012ddffc93a3d80f0d (diff) | |
| parent | 6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb (diff) | |
| download | frameworks_av-5e7616cc0e5493241211333134555d74aec89982.zip frameworks_av-5e7616cc0e5493241211333134555d74aec89982.tar.gz frameworks_av-5e7616cc0e5493241211333134555d74aec89982.tar.bz2 | |
Merge "Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base"
Diffstat (limited to 'cmds/stagefright')
| -rw-r--r-- | cmds/stagefright/Android.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index f26747b..e41b666 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -14,9 +14,9 @@ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ frameworks/base/media/libstagefright/include \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ - external/skia/include/core \ - external/skia/include/images \ + $(TOP)/frameworks/native/include/media/openmax \ + external/skia/include/core \ + external/skia/include/images \ LOCAL_CFLAGS += -Wno-multichar @@ -40,7 +40,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -64,7 +64,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -89,7 +89,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -113,7 +113,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -137,7 +137,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -162,7 +162,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES:= \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar |