diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-19 16:13:49 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-19 16:13:49 -0700 |
| commit | 8ab25d82b56c7604dc945e4385b74a75de093e56 (patch) | |
| tree | 7f112dd6a95cacfc2f6322f06f346162820ed23f /media/mca | |
| parent | 0e3b5a7986a7304c2239d35796a60e59b8076c55 (diff) | |
| parent | 1a4527ce9449d913e7a60dc3784520006d8955b7 (diff) | |
| download | frameworks_base-8ab25d82b56c7604dc945e4385b74a75de093e56.zip frameworks_base-8ab25d82b56c7604dc945e4385b74a75de093e56.tar.gz frameworks_base-8ab25d82b56c7604dc945e4385b74a75de093e56.tar.bz2 | |
resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp
Change-Id: If649bd9ef98181a1e1e341cc5b73d237586fb72c
Diffstat (limited to 'media/mca')
| -rw-r--r-- | media/mca/filterfw/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/mca/filterfw/Android.mk b/media/mca/filterfw/Android.mk index 2a9448d..a5b4b27 100644 --- a/media/mca/filterfw/Android.mk +++ b/media/mca/filterfw/Android.mk @@ -22,6 +22,7 @@ include $(all-subdir-makefiles) # Build main libfilterfw include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := libfilterfw @@ -30,7 +31,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_WHOLE_STATIC_LIBRARIES := libfilterfw_jni \ libfilterfw_native -LOCAL_SHARED_LIBRARIES := libstlport \ +LOCAL_SHARED_LIBRARIES := \ libGLESv2 \ libEGL \ libgui \ @@ -48,4 +49,5 @@ LOCAL_SHARED_LIBRARIES := libstlport \ # part of a system image. LOCAL_PRELINK_MODULE := false +include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) |