aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/gyp/dependencies.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'platform_tools/android/gyp/dependencies.gypi')
-rw-r--r--platform_tools/android/gyp/dependencies.gypi19
1 files changed, 18 insertions, 1 deletions
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index 3c6c423990..8bacd434a5 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',