Upstream version 10.39.225.0

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

diff --git a/src/base/base.gyp b/src/base/base.gyp
index 9f55a7d..fc77181 100644 (file)
--- a/src/base/base.gyp
+++ b/src/base/base.gyp
@@ -251,6 +251,9 @@
         'sync_socket_win.cc',
         'sync_socket_posix.cc',
       ],
+      'includes': [
+        '../build/android/increase_size_for_speed.gypi',
+      ],
     },
     {
       'target_name': 'base_i18n',
@@ -288,8 +291,9 @@
       'export_dependent_settings': [
         'base',
       ],
-
-
+      'includes': [
+        '../build/android/increase_size_for_speed.gypi',
+      ],
     },
     {
       'target_name': 'base_message_loop_tests',
@@ -357,6 +361,9 @@
         'prefs/value_map_pref_store.h',
         'prefs/writeable_pref_store.h',
       ],
+      'includes': [
+        '../build/android/increase_size_for_speed.gypi',
+      ],
     },
     {
       'target_name': 'base_prefs_test_support',
@@ -396,6 +403,9 @@
       'include_dirs': [
         '..',
       ],
+      'includes': [
+        '../build/android/increase_size_for_speed.gypi',
+      ],
     },
     # Include this target for a main() function that simply instantiates
     # and runs a base::TestSuite.
@@ -592,7 +602,8 @@
         'template_util_unittest.cc',
         'test/expectations/expectation_unittest.cc',
         'test/expectations/parser_unittest.cc',
-        'test/statistics_delta_reader_unittest.cc',
+        'test/histogram_tester_unittest.cc',
+        'test/test_pending_task_unittest.cc',
         'test/test_reg_util_win_unittest.cc',
         'test/trace_event_analyzer_unittest.cc',
         'threading/non_thread_safe_unittest.cc',
@@ -755,6 +766,14 @@
                 '../third_party/icu/icu.gyp:icudata',
               ],
             }],
+            ['incremental_chrome_dll', {
+              'defines': [
+                # Used only to workaround a linker bug, do not use this
+                # otherwise, and don't make it broader scope. See
+                # http://crbug.com/251251.
+                'INCREMENTAL_LINKING',
+              ],
+            }],
           ],
         }, {  # OS != "win"
           'dependencies': [
@@ -822,6 +841,7 @@
       ],
     },
     {
+      # GN: //base/test:test_support
       'target_name': 'test_support_base',
       'type': 'static_library',
       'dependencies': [
@@ -902,8 +922,8 @@
         'test/simple_test_clock.h',
         'test/simple_test_tick_clock.cc',
         'test/simple_test_tick_clock.h',
-        'test/statistics_delta_reader.cc',
-        'test/statistics_delta_reader.h',
+        'test/histogram_tester.cc',
+        'test/histogram_tester.h',
         'test/task_runner_test_template.cc',
         'test/task_runner_test_template.h',
         'test/test_file_util.cc',
@@ -913,12 +933,12 @@
         'test/test_file_util_mac.cc',
         'test/test_file_util_posix.cc',
         'test/test_file_util_win.cc',
+        'test/test_io_thread.cc',
+        'test/test_io_thread.h',
         'test/test_listener_ios.h',
         'test/test_listener_ios.mm',
         'test/test_pending_task.cc',
         'test/test_pending_task.h',
-        'test/test_process_killer_win.cc',
-        'test/test_process_killer_win.h',
         'test/test_reg_util_win.cc',
         'test/test_reg_util_win.h',
         'test/test_shortcut_win.cc',
@@ -939,6 +959,8 @@
         'test/thread_test_helper.h',
         'test/trace_event_analyzer.cc',
         'test/trace_event_analyzer.h',
+        'test/trace_to_file.cc',
+        'test/trace_to_file.h',
         'test/values_test_util.cc',
         'test/values_test_util.h',
       ],
@@ -973,49 +995,6 @@
         ],
       },
     },
-    {
-      'target_name': 'sanitizer_options',
-      'type': 'static_library',
-      'toolsets': ['host', 'target'],
-      'variables': {
-         # Every target is going to depend on sanitizer_options, so allow
-         # this one to depend on itself.
-         'prune_self_dependency': 1,
-         # Do not let 'none' targets depend on this one, they don't need to.
-         'link_dependency': 1,
-       },
-      'sources': [
-        'debug/sanitizer_options.cc',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      # Some targets may want to opt-out from ASan, TSan and MSan and link
-      # without the corresponding runtime libraries. We drop the libc++
-      # dependency and omit the compiler flags to avoid bringing instrumented
-      # code to those targets.
-      'conditions': [
-        ['use_custom_libcxx==1', {
-          'dependencies!': [
-            '../third_party/libc++/libc++.gyp:libcxx_proxy',
-          ],
-        }],
-        ['tsan==1', {
-          'sources': [
-            'debug/tsan_suppressions.cc',
-          ],
-        }],
-      ],
-      'cflags/': [
-        ['exclude', '-fsanitize='],
-        ['exclude', '-fsanitize-'],
-      ],
-      'direct_dependent_settings': {
-        'ldflags': [
-          '-Wl,-u_sanitizer_options_link_helper',
-        ],
-      },
-    },
   ],
   'conditions': [
     ['OS!="ios"', {
@@ -1236,6 +1215,9 @@
           'include_dirs': [
             '..',
           ],
+          'includes': [
+            '../build/android/increase_size_for_speed.gypi',
+          ],
         },
         {
           'target_name': 'xdg_mime',
@@ -1265,12 +1247,16 @@
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
+          'includes': [
+            '../build/android/increase_size_for_speed.gypi',
+          ],
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
+          # GN: //base:base_jni_headers
           'target_name': 'base_jni_headers',
           'type': 'none',
           'sources': [
@@ -1300,6 +1286,7 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'base_unittests_jni_headers',
           'type': 'none',
           'sources': [
@@ -1311,6 +1298,7 @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
+          # GN: //base:base_native_libraries_gen
           'target_name': 'base_native_libraries_gen',
           'type': 'none',
           'sources': [
@@ -1318,14 +1306,12 @@
           ],
           'variables': {
             'package_name': 'org/chromium/base/library_loader',
-            'include_path': 'android/java/templates',
-            'template_deps': [
-              'android/java/templates/native_libraries_array.h'
-            ],
+            'template_deps': [],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
+          # GN: //base:base_java
           'target_name': 'base_java',
           'type': 'none',
           'variables': {
@@ -1347,6 +1333,7 @@
           ],
         },
         {
+          # GN: //base:base_java_unittest_support
           'target_name': 'base_java_unittest_support',
           'type': 'none',
           'dependencies': [
@@ -1358,6 +1345,7 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # GN: //base:base_java_application_state
           'target_name': 'base_java_application_state',
           'type': 'none',
           # This target is used to auto-generate ApplicationState.java
@@ -1374,6 +1362,7 @@
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
+          # GN: //base:base_java_memory_pressure_level_list
           'target_name': 'base_java_memory_pressure_level_list',
           'type': 'none',
           'sources': [
@@ -1386,6 +1375,7 @@
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
+          # GN: //base:base_java_test_support
           'target_name': 'base_java_test_support',
           'type': 'none',
           'dependencies': [
@@ -1397,6 +1387,7 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # GN: //base:base_javatests
           'target_name': 'base_javatests',
           'type': 'none',
           'dependencies': [
@@ -1409,6 +1400,7 @@
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # TODO(GN)
           'target_name': 'chromium_android_linker',
           'type': 'shared_library',
           'conditions': [
@@ -1432,12 +1424,8 @@
             }],
           ],
         },
-
-      ],
-    }],
-    ['OS == "android"', {
-      'targets': [
         {
+          # TODO(GN)
           'target_name': 'base_perftests_apk',
           'type': 'none',
           'dependencies': [
@@ -1448,6 +1436,19 @@
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
+        {
+          # GN: //base:base_unittests_apk
+          'target_name': 'base_unittests_apk',
+          'type': 'none',
+          'dependencies': [
+            'base_java',
+            'base_unittests',
+          ],
+          'variables': {
+            'test_suite_name': 'base_unittests',
+          },
+          'includes': [ '../build/apk_test.gypi' ],
+        },
       ],
     }],
     ['OS == "win"', {
@@ -1466,22 +1467,6 @@
         },
       ],
     }],
-    ['OS == "android"', {
-      'targets': [
-        {
-          'target_name': 'base_unittests_apk',
-          'type': 'none',
-          'dependencies': [
-            'base_java',
-            'base_unittests',
-          ],
-          'variables': {
-            'test_suite_name': 'base_unittests',
-          },
-          'includes': [ '../build/apk_test.gypi' ],
-        },
-      ],
-    }],
     ['test_isolation_mode != "noop"', {
       'targets': [
         {