Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(578)

Unified Diff: gyp/dm.gyp

Issue 1696483002: Update Android framework makefile to build static and shared libs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: new test Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/bench.gyp ('k') | platform_tools/android/bin/gyp_to_android.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/dm.gyp
diff --git a/gyp/dm.gyp b/gyp/dm.gyp
index a05d079b8c0b986773b0176decf736c139984509..831cde7e04e19c16f9612f9f2f2ef1b5d57edba9 100644
--- a/gyp/dm.gyp
+++ b/gyp/dm.gyp
@@ -15,10 +15,8 @@
'conditions': [
['skia_android_framework', {
'libraries': [
- '-lskia',
- '-landroid',
+ 'skia_static.a',
'-lhwui',
- '-lutils',
],
'include_dirs': [
'../../../frameworks/base/libs/hwui/',
« no previous file with comments | « gyp/bench.gyp ('k') | platform_tools/android/bin/gyp_to_android.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698