diff options
| author | Mike Reed <reed@google.com> | 2009-12-09 18:38:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-09 18:38:19 -0800 |
| commit | b80acad7d6daa5d4279131e47afeffddabe838f0 (patch) | |
| tree | 4087dcf56d9f49421f18bff14db27c401577edb1 | |
| parent | a4e26ca9409d1bbb21c103f7a6c42ad926f81dbd (diff) | |
| parent | eedfd9d50490886cb681c0b73ef34649f3d94360 (diff) | |
| download | system_core-b80acad7d6daa5d4279131e47afeffddabe838f0.tar.gz system_core-b80acad7d6daa5d4279131e47afeffddabe838f0.tar.bz2 system_core-b80acad7d6daa5d4279131e47afeffddabe838f0.zip | |
am eedfd9d5: am 021529fe: link explicitly against libskia
Merge commit 'eedfd9d50490886cb681c0b73ef34649f3d94360'
* commit 'eedfd9d50490886cb681c0b73ef34649f3d94360':
link explicitly against libskia
| -rw-r--r-- | libjnigraphics/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libjnigraphics/Android.mk b/libjnigraphics/Android.mk index 2af67c3b..9458f282 100644 --- a/libjnigraphics/Android.mk +++ b/libjnigraphics/Android.mk @@ -21,7 +21,8 @@ LOCAL_SRC_FILES:= \ bitmap.cpp LOCAL_SHARED_LIBRARIES := \ - libandroid_runtime + libandroid_runtime \ + libskia LOCAL_C_INCLUDES += \ external/skia/include/core \ |