Skip to content

Commit

Permalink
Preparation work for third_party/openh264 build-from-src CL
Browse files Browse the repository at this point in the history
This CL reverts the parts of https://codereview.chromium.org/1394983003/ that added dummy unittest binaries for openh264.
This was decided to be a bad move (overhead of binaries, only wanting the tests if flag is set). The unittests will be placed and implemented in content_unittests instead in a follow-up CL.

This CL also pulls in openh264/src source code. The building of this and test code will be added in a follow-up CL.

BUG=500605, 468365

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

Cr-Commit-Position: refs/heads/master@{#359548}
  • Loading branch information
henbos authored and Commit bot committed Nov 13, 2015
1 parent c1f1f87 commit dc28e3f
Show file tree
Hide file tree
Showing 12 changed files with 10 additions and 92 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ v8.log
/third_party/nss
/third_party/omaha/src/omaha
/third_party/openmax_dl/
/third_party/openh264/src
/third_party/opus/src
/third_party/pdfsqueeze
/third_party/pdfium
Expand Down
1 change: 0 additions & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ group("both_gn_and_gyp") {
"//skia:skia_unittests",
"//sql:sql_unittests",
"//sync:sync_unit_tests",
"//third_party/openh264/tests:openh264_unittests",
"//ui/base:ui_base_unittests",
"//ui/gfx:gfx_unittests",
"//url:url_unittests",
Expand Down
3 changes: 3 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,9 @@ deps = {
'src/third_party/catapult':
Var('chromium_git') + '/external/github.com/catapult-project/catapult.git' + '@' +
'704c40202baaeb9484af0622aedf41c4a48e0df2',

'src/third_party/openh264/src':
Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + 'b37cda248234162033e3e11b0335f3131cdfe488',
}


Expand Down
1 change: 0 additions & 1 deletion build/all.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
'../testing/gtest.gyp:*',
'../third_party/icu/icu.gyp:*',
'../third_party/libxml/libxml.gyp:*',
'../third_party/openh264/tests/openh264_unittests.gyp:*',
'../third_party/sqlite/sqlite.gyp:*',
'../third_party/zlib/zlib.gyp:*',
'../ui/accessibility/accessibility.gyp:*',
Expand Down
1 change: 0 additions & 1 deletion build/gn_migration.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
'../third_party/WebKit/Source/wtf/wtf_tests.gyp:wtf_unittests',
'../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
'../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
'../third_party/openh264/tests/openh264_unittests.gyp:*',
'../third_party/smhasher/smhasher.gyp:pmurhash',
'../tools/battor_agent/battor_agent.gyp:battor_agent',
'../tools/telemetry/telemetry.gyp:bitmaptools#host',
Expand Down
23 changes: 0 additions & 23 deletions third_party/openh264/LICENSE

This file was deleted.

1 change: 1 addition & 0 deletions third_party/openh264/OWNERS
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
hbos@chromium.org
mflodman@chromium.org
5 changes: 1 addition & 4 deletions third_party/openh264/README.chromium
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Short Name: openh264
URL: http://www.openh264.org/
Version: v.1.4.0
License: 2-Clause BSD
License File: LICENSE
License File: src/LICENSE
Security Critical: yes

Description:
Expand All @@ -15,6 +15,3 @@ Cisco's H.264 video codec implementation.

Local Modifications:
N/A

Note: OpenH264 src has not yet been pulled in. A proper README.chromium file
was added anyway due to presubmit check.
20 changes: 0 additions & 20 deletions third_party/openh264/tests/BUILD.gn

This file was deleted.

20 changes: 0 additions & 20 deletions third_party/openh264/tests/openh264_unittests.cc

This file was deleted.

22 changes: 0 additions & 22 deletions third_party/openh264/tests/openh264_unittests.gyp

This file was deleted.

4 changes: 4 additions & 0 deletions tools/checklicenses/checklicenses.py
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,10 @@ def PrintUsage():
'third_party/modp_b64': [
'UNKNOWN',
],
# Missing license headers in openh264 sources: https://github.com/cisco/openh264/issues/2233
'third_party/openh264/src': [
'UNKNOWN',
],
'third_party/openmax_dl/dl' : [
'Khronos Group',
],
Expand Down

0 comments on commit dc28e3f

Please sign in to comment.