Skip to content

Commit

Permalink
Revert of [third-party] Netty fork of Tomcat Native (patchset Pissand…
Browse files Browse the repository at this point in the history
…shittium#12 id:210001 of https://codereview.chromium.org/1537473002/ )

Reason for revert:
error on the clank-tot bot:
https://uberchromegw.corp.google.com/i/internal.client.clank_tot/builders/clang-clankium-tot-builder/builds/17864/steps/compile/logs/stdio

Original issue's description:
> [third-party] Netty Server and dependencies
>
> Added new libraries to the Chromium third-party library collection:
> 1. Netty 4 Server. See http://netty.io
> 2. Netty fork of Tomcat Native (netty-tcnative). See http://netty.io/wiki/forked-tomcat-native.html
> and the library tc-native depends on:
> 3. 'Apache Portable Runtime'. See http://apr.apache.org
>
> The server provides support for Http/2 protocol, which is needed for testing some of the Cronet features
> on Android, in particular, the new Bidirectional Streaming API.
>
> To build the netty-tcnative library call:
> ninja -C out/Debug netty-tcnative
>
> The output files can be found here:
> - out/Debug/lib/libnetty-tcnative.so
> - out/Debug/lib.java/netty-tcnative.jar
>
> BUG=563732
>
> Committed: https://crrev.com/6dd98af3db0b8e809ed95ff66620181efbf3f8f1
> Cr-Commit-Position: refs/heads/master@{#370791}

TBR=xunjieli@chromium.org,pauljensen@chromium.org,mef@chromium.org,rsleevi@chrium.org,agl@chromium.org,davidben@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=563732

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

Cr-Commit-Position: refs/heads/master@{#370815}
  • Loading branch information
kapishnikov authored and Commit bot committed Jan 21, 2016
1 parent be50aaf commit e384664
Show file tree
Hide file tree
Showing 16 changed files with 1 addition and 1,372 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ vs-chromium-project.txt
/third_party/angle
/third_party/angle_dx11
/third_party/apache-mime4j
/third_party/apache-portable-runtime/src
/third_party/apache-win32/bin/*.exe
/third_party/apache-win32/bin/*.dll
/third_party/apache-win32/bin/iconv/*.so
Expand Down Expand Up @@ -367,8 +366,6 @@ vs-chromium-project.txt
/third_party/mocha
/third_party/mockito/src
/third_party/nacl_sdk_binaries/
/third_party/netty-tcnative/src
/third_party/netty4/src
/third_party/nss
/third_party/omaha/src/omaha
/third_party/openmax_dl/
Expand Down
11 changes: 1 addition & 10 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,6 @@ deps_os = {
'src/third_party/apache-mime4j':
Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',

'src/third_party/apache-portable-runtime/src':
Var('chromium_git') + '/external/apache-portable-runtime.git' + '@' + 'c76a8c4277e09a82eaa229e35246edea1ee0a6a1',

'src/third_party/appurify-python/src':
Var('chromium_git') + '/external/github.com/appurify/appurify-python.git' + '@' + 'ee7abd5c5ae3106f72b2a0b9d2cb55094688e867',

Expand All @@ -452,7 +449,7 @@ deps_os = {
'src/third_party/freetype-android/src':
Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + 'a512b0fe7a8d9db0e5aa9c0a4db1e92cb861722d',

'src/third_party/elfutils/src':
'src/third_party/elfutils/src':
Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7',

'src/third_party/httpcomponents-client':
Expand All @@ -473,12 +470,6 @@ deps_os = {
'src/third_party/mockito/src':
Var('chromium_git') + '/external/mockito/mockito.git' + '@' + '4d987dcd923b81525c42b1333e6c4e07440776c3',

'src/third_party/netty-tcnative/src':
Var('chromium_git') + '/external/netty-tcnative.git' + '@' + '12d01332921695e974175870175eb14a889313a1',

'src/third_party/netty4/src':
Var('chromium_git') + '/external/netty4.git' + '@' + 'e0f26303b4ce635365be19414d0ac81f2ef6ba3c',

'src/third_party/robolectric/lib':
Var('chromium_git') + '/chromium/third_party/robolectric.git' + '@' + '6b63c99a8b6967acdb42cbed0adb067c80efc810',

Expand Down
5 changes: 0 additions & 5 deletions components/cronet.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,6 @@
'dependencies': [
'cronet_java',
'../net/net.gyp:net_java_test_support',
'../third_party/netty-tcnative/netty-tcnative.gyp:netty-tcnative',
'../third_party/netty4/netty.gyp:netty_all',
],
'variables': {
'apk_name': 'CronetTest',
Expand All @@ -391,9 +389,6 @@
'asset_location': 'cronet/android/test/assets',
'native_lib_target': 'libcronet_tests',
'run_findbugs': 1,
'additional_bundled_libs': [
'<(PRODUCT_DIR)/lib/libnetty-tcnative.so',
],
},
'includes': [ '../build/java_apk.gypi' ],
},
Expand Down
294 changes: 0 additions & 294 deletions third_party/apache-portable-runtime/LICENSE

This file was deleted.

2 changes: 0 additions & 2 deletions third_party/apache-portable-runtime/OWNERS

This file was deleted.

24 changes: 0 additions & 24 deletions third_party/apache-portable-runtime/README.chromium

This file was deleted.

113 changes: 0 additions & 113 deletions third_party/apache-portable-runtime/apr.gyp

This file was deleted.

Loading

0 comments on commit e384664

Please sign in to comment.