diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-05-11 05:34:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-11 05:34:04 +0000 |
| commit | 94f55b30e3e04dbea63836197e76c7464d8d6d37 (patch) | |
| tree | 063c85fa94830d271228b2f1101554b2f93f3162 | |
| parent | 6f8fb9594fa5387340601c8b6e3e13f51e57f54b (diff) | |
| parent | fde1f91d9b370758f79a7eb6e14df38a9789e10a (diff) | |
| download | frameworks_base-94f55b30e3e04dbea63836197e76c7464d8d6d37.zip frameworks_base-94f55b30e3e04dbea63836197e76c7464d8d6d37.tar.gz frameworks_base-94f55b30e3e04dbea63836197e76c7464d8d6d37.tar.bz2 | |
Merge "Tracking libnativehelper dependencies"
| -rw-r--r-- | core/jni/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index d8f20c1..c1a8e92 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -151,7 +151,7 @@ LOCAL_C_INCLUDES += \ $(call include-path-for, bluedroid) \ $(call include-path-for, libhardware)/hardware \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ - $(TOP)/frameworks/av/include \ + $(TOP)/frameworks/av/include \ external/skia/include/core \ external/skia/include/effects \ external/skia/include/images \ @@ -224,6 +224,7 @@ endif LOCAL_MODULE:= libandroid_runtime +include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) |