Commit cb9354f9 authored by simonb@chromium.org's avatar simonb@chromium.org

Turn off chromium linker on the content shell.

Revert the content shell portion of:
  https://codereview.chromium.org/329223002/
This will enable landing of:
  https://codereview.chromium.org/371943003/

There is an unexplained error when the chromium linker is turned on for
the content shell.  It manifests (in logcat) as:

0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: FATAL EXCEPTION: ChildProcessMain
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: Process: org.chromium.content_shell_apk:sandboxed_process0, PID: 23281
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: java.lang.RuntimeException: Parcel android.os.Parcel@420d90b8: Unmarshalling unknown type code 6881388 at offset 244
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at android.os.Parcel.readValue(Parcel.java:2080)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at android.os.Parcel.readArrayMapInternal(Parcel.java:2314)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at android.os.Bundle.unparcel(Bundle.java:249)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at android.os.Bundle.keySet(Bundle.java:345)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at org.chromium.base.library_loader.Linker.createLibInfoMapFromBundle(Linker.java:1090)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at org.chromium.base.library_loader.Linker.useSharedRelrosLocked(Linker.java:737)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at org.chromium.base.library_loader.Linker.finishLibraryLoad(Linker.java:443)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at org.chromium.base.library_loader.LibraryLoader.loadAlreadyLocked(LibraryLoader.java:179)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at org.chromium.base.library_loader.LibraryLoader.loadNow(LibraryLoader.java:125)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at org.chromium.content.app.ChildProcessService$2.run(ChildProcessService.java:149)
0a3b6:  07-08 13:40:43.925 23281 23295 E AndroidRuntime: 	at java.lang.Thread.run(Thread.java:841)

This does not occur with the chrome shell.  The change in

  https://codereview.chromium.org/371943003/

corrects chromium linker operation and resolves crbug/388356, but to land that
requires that we turn off the chromium linker on the content shell first.

BUG=388356

Review URL: https://codereview.chromium.org/379603002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282030 0039d316-1c4b-4281-b951-d872f2087c98
parent ab31e4f7
...@@ -1033,11 +1033,6 @@ ...@@ -1033,11 +1033,6 @@
'<(PRODUCT_DIR)/icudtl.dat', '<(PRODUCT_DIR)/icudtl.dat',
], ],
}], }],
['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and profiling_full_stack_frames != 1', {
# Only enable the chromium linker on regular builds, since the
# component build crashes on Android 4.4. See b/11379966
'use_chromium_linker': '1',
}],
], ],
}, },
'conditions': [ 'conditions': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment