diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-19 15:57:26 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-19 15:57:26 -0700 |
| commit | c04d92cac93fdbbdc6d104f15f6496d197753e92 (patch) | |
| tree | 8d8e1b83666562d4f28998c4b1e9b2ee5ac2ec44 /media/mca | |
| parent | 901c36e51c052c6f0556b6272bbeaaa3aa716fd8 (diff) | |
| parent | 1a4527ce9449d913e7a60dc3784520006d8955b7 (diff) | |
| download | frameworks_base-c04d92cac93fdbbdc6d104f15f6496d197753e92.zip frameworks_base-c04d92cac93fdbbdc6d104f15f6496d197753e92.tar.gz frameworks_base-c04d92cac93fdbbdc6d104f15f6496d197753e92.tar.bz2 | |
resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp
Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
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) |