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

Unified Diff: gyp/core.gyp

Issue 140503007: Scripts to generate Android.mk for framework Skia. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update copyrights, remove unnecessary code. Created 6 years, 11 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
Index: gyp/core.gyp
diff --git a/gyp/core.gyp b/gyp/core.gyp
index 868abea646bd662f9b5e46d6b3c00364852f9fb4..c4dfe0079b1f8f7ba33c36ac03ce5b0013900472 100644
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -76,11 +76,16 @@
'config/win',
],
}],
- [ 'skia_os == "android"', {
+ [ 'skia_os == "android" and skia_android_framework==0', {
djsollen 2014/01/21 17:47:37 I don't think you need to modify this file. Just u
scroggo 2014/01/21 19:10:06 Done.
'dependencies': [
'android_deps.gyp:cpu_features',
],
}],
+ [ 'skia_android_framework', {
+ 'libraries': [
+ '-lcutils',
+ ],
+ }],
[ 'skia_arch_type == "arm"', {
# The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
'sources': [

Powered by Google App Engine
This is Rietveld 408576698