6776518bea
This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
40 lines
1.1 KiB
Python
40 lines
1.1 KiB
Python
# Define rules for which include paths are allowed in our source.
|
|
include_rules = [
|
|
# Base is only used to build Android APK tests and may not be referenced by
|
|
# WebRTC production code.
|
|
"-base",
|
|
"-chromium",
|
|
"+external/webrtc/webrtc", # Android platform build.
|
|
"+gflags",
|
|
"+libyuv",
|
|
"-webrtc", # Has to be disabled; otherwise all dirs below will be allowed.
|
|
# Individual headers that will be moved out of here, see webrtc:4243.
|
|
"+webrtc/common_types.h",
|
|
"+webrtc/config.h",
|
|
"+webrtc/transport.h",
|
|
"+webrtc/typedefs.h",
|
|
"+webrtc/video_receive_stream.h",
|
|
"+webrtc/video_send_stream.h",
|
|
"+webrtc/voice_engine_configurations.h",
|
|
|
|
"+WebRTC",
|
|
"+webrtc/api",
|
|
"+webrtc/base",
|
|
"+webrtc/modules/include",
|
|
"+webrtc/rtc_base",
|
|
"+webrtc/test",
|
|
"+webrtc/tools",
|
|
]
|
|
|
|
# The below rules will be removed when webrtc:4243 is fixed.
|
|
specific_include_rules = {
|
|
"video_receive_stream\.h": [
|
|
"+webrtc/common_video/include",
|
|
"+webrtc/media/base",
|
|
],
|
|
"video_send_stream\.h": [
|
|
"+webrtc/common_video/include",
|
|
"+webrtc/media/base",
|
|
],
|
|
}
|