Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / base / base.gypi

diff --git a/src/base/base.gypi b/src/base/base.gypi
index 7f25947..9ef1a73 100644 (file)
--- a/src/base/base.gypi
+++ b/src/base/base.gypi
@@ -45,6 +45,8 @@
           'android/fifo_utils.h',
           'android/important_file_writer_android.cc',
           'android/important_file_writer_android.h',
+          'android/locale_utils.h',
+          'android/locale_utils.cc',
           'android/scoped_java_ref.cc',
           'android/scoped_java_ref.h',
           'android/jni_android.cc',
@@ -61,6 +63,7 @@
           'android/jni_weak_ref.h',
           'android/library_loader/library_loader_hooks.cc',
           'android/library_loader/library_loader_hooks.h',
+          'android/library_loader/library_load_from_apk_status_codes.h',
           'android/memory_pressure_listener_android.cc',
           'android/memory_pressure_listener_android.h',
           'android/java_handler_thread.cc',
@@ -81,7 +84,7 @@
           'atomicops.h',
           'atomicops_internals_gcc.h',
           'atomicops_internals_mac.h',
-          'atomicops_internals_tsan.h',
+          'atomicops_internals_portable.h',
           'atomicops_internals_x86_gcc.cc',
           'atomicops_internals_x86_gcc.h',
           'atomicops_internals_x86_msvc.h',
@@ -122,6 +125,7 @@
           'command_line.cc',
           'command_line.h',
           'compiler_specific.h',
+          'containers/adapters.h',
           'containers/hash_tables.h',
           'containers/linked_list.h',
           'containers/mru_cache.h',
@@ -327,11 +331,15 @@
           'memory/discardable_memory_emulated.h',
           'memory/discardable_memory_linux.cc',
           'memory/discardable_memory_mac.cc',
-          'memory/discardable_memory_malloc.cc',
-          'memory/discardable_memory_malloc.h',
           'memory/discardable_memory_manager.cc',
           'memory/discardable_memory_manager.h',
+          'memory/discardable_memory_shmem.cc',
+          'memory/discardable_memory_shmem.h',
+          'memory/discardable_memory_shmem_allocator.cc',
+          'memory/discardable_memory_shmem_allocator.h',
           'memory/discardable_memory_win.cc',
+          'memory/discardable_shared_memory.cc',
+          'memory/discardable_shared_memory.h',
           'memory/linked_ptr.h',
           'memory/manual_constructor.h',
           'memory/memory_pressure_listener.cc',
@@ -431,6 +439,7 @@
           'power_monitor/power_monitor.h',
           'power_monitor/power_monitor_device_source_android.cc',
           'power_monitor/power_monitor_device_source_android.h',
+          'power_monitor/power_monitor_device_source_chromeos.cc',
           'power_monitor/power_monitor_device_source.cc',
           'power_monitor/power_monitor_device_source.h',
           'power_monitor/power_monitor_device_source_ios.mm',
@@ -488,10 +497,12 @@
           'process/process_metrics_win.cc',
           'process/process_posix.cc',
           'process/process_win.cc',
-          'profiler/scoped_profile.cc',
-          'profiler/scoped_profile.h',
           'profiler/alternate_timer.cc',
           'profiler/alternate_timer.h',
+          'profiler/scoped_profile.cc',
+          'profiler/scoped_profile.h',
+          'profiler/scoped_tracker.cc',
+          'profiler/scoped_tracker.h',
           'profiler/tracked_time.cc',
           'profiler/tracked_time.h',
           'rand_util.cc',
@@ -837,6 +848,11 @@
                'ANDROID_SINCOS_PROVIDED',
             ],
           }],
+          ['<(chromeos) == 1', {
+            'sources!': [
+              'power_monitor/power_monitor_device_source_posix.cc',
+            ],
+          }],
           ['OS == "ios" and _toolset != "host"', {
             'sources/': [
               # Pull in specific Mac files for iOS (which have been filtered out
@@ -928,6 +944,10 @@
             ],
           }],
           ['(OS == "mac" or OS == "ios") and >(nacl_untrusted_build)==0', {
+            'sources': [
+              'memory/discardable_memory_mach.cc',
+              'memory/discardable_memory_mach.h',
+            ],
             'sources/': [
               ['exclude', '^files/file_path_watcher_stub\\.cc$'],
               ['exclude', '^base_paths_posix\\.cc$'],