summaryrefslogtreecommitdiffstats
path: root/base/base.gypi
diff options
context:
space:
mode:
Diffstat (limited to 'base/base.gypi')
-rw-r--r--base/base.gypi10
1 files changed, 8 insertions, 2 deletions
diff --git a/base/base.gypi b/base/base.gypi
index 09a3afa..1767014 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -304,8 +304,6 @@
'memory/aligned_memory.h',
'memory/discardable_memory.cc',
'memory/discardable_memory.h',
- 'memory/discardable_memory_allocator_android.cc',
- 'memory/discardable_memory_allocator_android.h',
'memory/discardable_memory_android.cc',
'memory/discardable_memory_emulated.cc',
'memory/discardable_memory_emulated.h',
@@ -770,6 +768,14 @@
['include', '^threading/platform_thread_linux\\.cc$'],
],
}],
+ ['OS == "android" and _toolset == "target"', {
+ 'sources': [
+ 'memory/discardable_memory_ashmem_allocator.cc',
+ 'memory/discardable_memory_ashmem_allocator.h',
+ 'memory/discardable_memory_ashmem.cc',
+ 'memory/discardable_memory_ashmem.h',
+ ],
+ }],
['OS == "android" and >(nacl_untrusted_build)==0', {
'sources!': [
'base_paths_posix.cc',