Make mojo_system honor component type

We've figured out a way to make things work without a shared library, so libmojo_system is no more. BUG=none TEST=none R=viettrungluu@chromium.org Review URL: https://codereview.chromium.org/215153007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260629 0039d316-1c4b-4281-b951-d872f2087c98
dednal · Mar 31, 2014 · 3f9b509 · 3f9b509
1 parent 978f535
commit 3f9b509
Show file tree

Hide file tree

Showing 20 changed files with 11 additions and 68 deletions.
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
@@ -138,7 +138,6 @@
           '<(PRODUCT_DIR)/chrome_elf.dll',
           '<(PRODUCT_DIR)/clearkeycdm.dll',
           '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
-          '<(PRODUCT_DIR)/mojo_system.dll',
           '<(PRODUCT_DIR)/ppapi_tests.dll',
           '<(PRODUCT_DIR)/security_tests.dll',
           'tools/build/repack_locales.py',

diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
@@ -9,7 +9,6 @@
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
           '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
         ],
@@ -66,7 +65,6 @@
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/libEGL.dll',
           '<(PRODUCT_DIR)/libGLESv2.dll',
-          '<(PRODUCT_DIR)/mojo_system.dll',
           '<(PRODUCT_DIR)/nacl64<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/osmesa.dll',
           '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',

diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
@@ -545,11 +545,6 @@
               '<(PRODUCT_DIR)/lib/libpeerconnection.so',
             ],
           }],
-          ['use_mojo==1', {
-            'packaging_files_binaries': [
-              '<(PRODUCT_DIR)/lib/libmojo_system.so',
-            ],
-          }],
         ],
       },
       'targets': [

diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
@@ -150,12 +150,6 @@ stage_install_common() {
   # ffmpeg libs
   install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/"
 
-  install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/"
-
-  if [ -f "${BUILDDIR}/lib/libmojo_system.so" ]; then
-    install -m 644 -s "${BUILDDIR}/lib/libmojo_system.so" "${STAGEDIR}/${INSTALLDIR}/lib/"
-  fi
-
   # Widevine CDM.
   if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
     install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INSTALLDIR}/"
@@ -178,6 +172,8 @@ stage_install_common() {
 
   # peerconnection shared library
   if [ -f "${BUILDDIR}/lib/libpeerconnection.so" ]; then
+    install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/"
+
     install -m 644 -s "${BUILDDIR}/lib/libpeerconnection.so" "${STAGEDIR}/${INSTALLDIR}/lib/"
   fi
 

diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
@@ -107,9 +107,8 @@ do_package() {
   # Use find-requires script to make sure the dependencies are complete
   # (especially libc and libstdc++ versions).
   # - Filter out udev to avoid libudev.so.0 vs. libudev.so.1 mismatches.
-  # - Filter out libmojo_system since that a library that we provide.
   DETECTED_DEPENDS="$(echo "${BUILDDIR}/chrome" | /usr/lib/rpm/find-requires |
-      grep -v 'udev\|libmojo_system')"
+      grep -v udev)"
 
   # Compare the expected dependency list to the generated list.
   BAD_DIFF=0

diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
@@ -223,17 +223,11 @@
                     '<(PRODUCT_DIR)/icudtl.dat',
                   ],
                 }],
-                ['use_mojo==0', {
-                  'inputs!': [
-                    '<(PRODUCT_DIR)/mojo_system.dll',
-                  ],
-                }],
               ],
               'inputs': [
                 '<(create_installer_archive_py_path)',
                 '<(PRODUCT_DIR)/chrome.exe',
                 '<(PRODUCT_DIR)/chrome.dll',
-                '<(PRODUCT_DIR)/mojo_system.dll',
                 '<(PRODUCT_DIR)/nacl64.exe',
                 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
                 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',

diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
@@ -185,17 +185,11 @@
             '<(PRODUCT_DIR)/icudtl.dat',
           ],
         }],
-        ['use_mojo==0', {
-          'inputs!': [
-            '<(PRODUCT_DIR)/mojo_system.dll',
-          ],
-        }],
       ],
       'inputs': [
         '<(create_installer_archive_py_path)',
         '<(PRODUCT_DIR)/chrome.exe',
         '<@(chrome_dll_path)',
-        '<(PRODUCT_DIR)/mojo_system.dll',
         '<(PRODUCT_DIR)/nacl64.exe',
         '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
         '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',

diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
@@ -29,7 +29,6 @@ icudt.dll: %(VersionDir)s\
 icudtl.dat: %(VersionDir)s\
 libEGL.dll: %(VersionDir)s\
 libGLESv2.dll: %(VersionDir)s\
-mojo_system.dll: %(VersionDir)s\
 nacl64.exe: %(VersionDir)s\
 nacl_irt_x86_32.nexe: %(VersionDir)s\
 nacl_irt_x86_64.nexe: %(VersionDir)s\

diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
@@ -15,7 +15,6 @@
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/pyproto/google/__init__.py',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
@@ -86,7 +85,6 @@
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
           '<(PRODUCT_DIR)/libEGL.dll',
           '<(PRODUCT_DIR)/libGLESv2.dll',
-          '<(PRODUCT_DIR)/mojo_system.dll',
           '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
           '<(PRODUCT_DIR)/osmesa.dll',
         ],

diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
@@ -17,7 +17,6 @@
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',

diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
@@ -63,12 +63,6 @@ FILES = [
     'filename': 'libffmpegsumo.so',
     'buildtype': ['dev', 'official'],
   },
-  {
-    'filename': 'lib/libmojo_system.so',
-    'buildtype': ['dev', 'official'],
-    # TODO(sky): remove this when we remove use_mojo.
-    'optional': ['dev', 'official'],
-  },
   {
     'filename': 'lib/libpeerconnection.so',
     'buildtype': ['dev', 'official'],

diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
@@ -305,11 +305,6 @@ FILES = [
     'filename': 'locales/zh-TW.pak',
     'buildtype': ['dev', 'official'],
   },
-  {
-    'filename': 'mojo_system.dll',
-    'buildtype': ['dev', 'official'],
-    'filegroup': ['default', 'symsrc'],
-  },
   {
     'filename': 'policy_templates.zip',
     'buildtype': ['official'],
@@ -681,11 +676,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
     'archive': 'chrome-win32-syms.zip',
   },
-  {
-    'filename': 'mojo_system.dll.pdb',
-    'buildtype': ['dev', 'official'],
-    'archive': 'chrome-win32-syms.zip',
-  },
   {
     'filename': 'nacl64.exe.pdb',
     'arch': ['32bit'],

diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
@@ -49,7 +49,6 @@
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/locales/fr.pak',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
@@ -113,7 +112,6 @@
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/chrome_elf.dll',
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
-          '<(PRODUCT_DIR)/mojo_system.dll',
           '<(PRODUCT_DIR)/osmesa.dll',
         ],
         'isolate_dependency_untracked': [

diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate
@@ -33,7 +33,6 @@
           '<(PRODUCT_DIR)/libclearkeycdm.so',
           '<(PRODUCT_DIR)/libclearkeycdmadapter.so',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/plugins/libtest_netscape_plugin.so',
           '<(PRODUCT_DIR)/plugins/libnpapi_test_plugin.so',
         ],
@@ -87,7 +86,6 @@
           '<(PRODUCT_DIR)/clearkeycdm.dll',
           '<(PRODUCT_DIR)/clearkeycdmadapter.dll',
           '<(PRODUCT_DIR)/content_shell.pak',
-          '<(PRODUCT_DIR)/mojo_system.dll',
           '<(PRODUCT_DIR)/plugins/np_test_netscape_plugin.dll',
           '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
         ],

diff --git a/content/content_common.gypi b/content/content_common.gypi
@@ -506,15 +506,6 @@
         'content.gyp:webkit_version',
       ],
     }],
-    # Work around for bug in linker used on ia32 and mipsel machines (gold is
-    # not used on ia32 and mipsel machines). See bug 353273.
-    ['use_mojo==1 and OS=="linux" and (target_arch=="ia32" or target_arch=="mipsel") and component=="static_library"', {
-      'link_settings': {
-        'libraries': [
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
-        ],
-      },
-    }],
     ['use_mojo==0', {
       'sources!': [
         'common/mojo/mojo_channel_init.cc',

diff --git a/content/content_unittests.isolate b/content/content_unittests.isolate
@@ -42,7 +42,6 @@
         'isolate_dependency_tracked': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
@@ -70,7 +69,6 @@
         ],
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/ffmpegsumo.dll',
-          '<(PRODUCT_DIR)/mojo_system.dll',
           '<(PRODUCT_DIR)/ui_test.pak',
         ],
       },

diff --git a/mojo/mojo_apps_js_unittests.isolate b/mojo/mojo_apps_js_unittests.isolate
@@ -51,7 +51,6 @@
     ['OS=="linux"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/lib/libmojo_test_support.so',
         ],
       },
@@ -71,7 +70,6 @@
       'variables': {
         'isolate_dependency_tracked': [
           '<(PRODUCT_DIR)/libmojo_gles2.dylib',
-          '<(PRODUCT_DIR)/libmojo_system.dylib',
           '<(PRODUCT_DIR)/libmojo_test_support.dylib',
         ],
       },

diff --git a/mojo/mojo_js_unittests.isolate b/mojo/mojo_js_unittests.isolate
@@ -50,7 +50,6 @@
     ['OS=="linux"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/lib/libmojo_test_support.so',
         ],
       },
@@ -69,7 +68,6 @@
     ['OS=="mac"', {
       'variables': {
         'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/libmojo_system.dylib',
           '<(PRODUCT_DIR)/libmojo_test_support.dylib',
         ],
       },

diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
@@ -2,7 +2,7 @@
   'targets': [
     {
       'target_name': 'mojo_system',
-      'type': 'shared_library',
+      'type': '<(component)',
       'defines': [
         'MOJO_SYSTEM_IMPLEMENTATION',
       ],

diff --git a/mojo/public/c/system/system_export.h b/mojo/public/c/system/system_export.h
@@ -5,6 +5,7 @@
 #ifndef MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_
 #define MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_
 
+#if defined(COMPONENT_BUILD)
 #if defined(WIN32)
 
 #if defined(MOJO_SYSTEM_IMPLEMENTATION)
@@ -23,4 +24,10 @@
 
 #endif  // defined(WIN32)
 
+#else  // !defined(COMPONENT_BUILD)
+
+#define MOJO_SYSTEM_EXPORT
+
+#endif  // defined(COMPONENT_BUILD)
+
 #endif  // MOJO_PUBLIC_C_SYSTEM_SYSTEM_EXPORT_H_