diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 19:28:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 19:28:18 +0000 |
| commit | 13657e2d6757531a7bf0654bb847ac8c6faa5c43 (patch) | |
| tree | 5a92567d67e5cfa08fa0c2819c654df8c6f4d6cb | |
| parent | b8d9bb07f41fb208f6b6a6053af87c3406a67989 (diff) | |
| parent | 9e8e96556697c955d4eea058ac051f11aea0a3b5 (diff) | |
| download | android_frameworks_ex-13657e2d6757531a7bf0654bb847ac8c6faa5c43.tar.gz android_frameworks_ex-13657e2d6757531a7bf0654bb847ac8c6faa5c43.tar.bz2 android_frameworks_ex-13657e2d6757531a7bf0654bb847ac8c6faa5c43.zip | |
am 9e8e9655: am c8e9c014: Merge "Clean up makefile cruft."
* commit '9e8e96556697c955d4eea058ac051f11aea0a3b5':
Clean up makefile cruft.
| -rw-r--r-- | variablespeed/jni/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/variablespeed/jni/Android.mk b/variablespeed/jni/Android.mk index 0a7818a..ef6ff78 100644 --- a/variablespeed/jni/Android.mk +++ b/variablespeed/jni/Android.mk @@ -14,6 +14,7 @@ # LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk # TODO: Remove the .cc extension, just .cpp. # TODO: Change module name to use underscores not hyphens. @@ -36,14 +37,12 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(call include-path-for, wilhelm) \ - external/stlport/stlport \ - bionic \ LOCAL_SHARED_LIBRARIES := \ libOpenSLES \ - libstlport \ libutils \ libcutils \ liblog \ +include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) |