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

Unified Diff: platform_tools/android/gyp/dependencies.gypi

Issue 1108013002: Make Skia for Android libjpeg use ashmem (Closed) Base URL: https://skia.googlesource.com/skia.git@jpeg-scanline
Patch Set: Moving README and LICENSE up one dir Created 5 years, 8 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 | « no previous file | platform_tools/android/third_party/ashmem/LICENSE » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/gyp/dependencies.gypi
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index 3c6c423990c47dbe13b31f4bc10007a7ba2e9d37..8bacd434a5eb0f928c4a82220e6240e76cec5a99 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -35,6 +35,19 @@
],
},
{
+ 'target_name': 'ashmem',
+ 'type': 'static_library',
+ 'sources': [
+ '../third_party/ashmem/cutils/ashmem.h',
+ '../third_party/ashmem/cutils/ashmem-dev.c'
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../third_party/ashmem',
+ ]
+ },
+ },
+ {
'target_name': 'expat',
'type': 'static_library',
'sources': [
@@ -102,6 +115,9 @@
{
'target_name': 'jpeg',
'type': 'static_library',
+ 'dependencies': [
+ 'ashmem'
+ ],
'sources': [
'../third_party/externals/jpeg/jcapimin.c',
'../third_party/externals/jpeg/jcapistd.c',
@@ -144,7 +160,7 @@
'../third_party/externals/jpeg/jidctfst.c',
'../third_party/externals/jpeg/jidctint.c',
'../third_party/externals/jpeg/jidctred.c',
- '../third_party/externals/jpeg/jmem-android.c',
+ '../third_party/externals/jpeg/jmem-ashmem.c',
'../third_party/externals/jpeg/jmemmgr.c',
'../third_party/externals/jpeg/jquant1.c',
'../third_party/externals/jpeg/jquant2.c',
@@ -192,6 +208,7 @@
'-w',
'-fvisibility=hidden',
'-DAVOID_TABLES',
+ '-DUSE_ANDROID_ASHMEM',
'-O3',
'-fstrict-aliasing',
'-fprefetch-loop-arrays',
« no previous file with comments | « no previous file | platform_tools/android/third_party/ashmem/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698