Commit 4d99f381 authored by James Dong's avatar James Dong Committed by Martin Storsjo

Upstream Android make file changes

Adapted from upstream commits 6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb
and 559bf2836f5da25b75bfb229fec0d20d540ee426.
parent f2955b86
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
include frameworks/base/media/libstagefright/codecs/common/Config.mk include frameworks/av/media/libstagefright/codecs/common/Config.mk
...@@ -95,9 +95,9 @@ LOCAL_STATIC_LIBRARIES := ...@@ -95,9 +95,9 @@ LOCAL_STATIC_LIBRARIES :=
LOCAL_SHARED_LIBRARIES := LOCAL_SHARED_LIBRARIES :=
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
frameworks/base/media/libstagefright/include \ frameworks/av/include \
frameworks/base/media/libstagefright/codecs/common/include \ frameworks/av/media/libstagefright/include \
frameworks/base/include \ frameworks/av/media/libstagefright/codecs/common/include \
$(LOCAL_PATH)/src \ $(LOCAL_PATH)/src \
$(LOCAL_PATH)/inc $(LOCAL_PATH)/inc
...@@ -124,9 +124,9 @@ LOCAL_SRC_FILES := \ ...@@ -124,9 +124,9 @@ LOCAL_SRC_FILES := \
SoftAMRWBEncoder.cpp SoftAMRWBEncoder.cpp
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
frameworks/base/media/libstagefright/include \ frameworks/av/media/libstagefright/include \
frameworks/base/include/media/stagefright/openmax \ frameworks/av/media/libstagefright/codecs/common/include \
frameworks/base/media/libstagefright/codecs/common/include \ frameworks/native/include/media/openmax
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libstagefright_amrwbenc libstagefright_amrwbenc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment