From 04af839a88fa2e7c8b619a65f2daf8bc5e3910d7 Mon Sep 17 00:00:00 2001 From: tommi Date: Sun, 14 Feb 2016 08:11:10 -0800 Subject: [PATCH] Move refcount.h and scoped_ref_ptr.h to rtc_base_approved. BUG= Review URL: https://codereview.webrtc.org/1701533002 Cr-Commit-Position: refs/heads/master@{#11615} --- webrtc/base/BUILD.gn | 4 ++-- webrtc/base/base.gyp | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index bebef8e525..cbfa3b1e81 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -138,9 +138,11 @@ static_library("rtc_base_approved") { "platform_thread_types.h", "random.cc", "random.h", + "refcount.h", "safe_conversions.h", "safe_conversions_impl.h", "scoped_ptr.h", + "scoped_ref_ptr.h", "stringencode.cc", "stringencode.h", "stringutils.cc", @@ -388,10 +390,8 @@ static_library("rtc_base") { "profiler.h", "proxyserver.cc", "proxyserver.h", - "refcount.h", "referencecountedsingletonfactory.h", "rollingaccumulator.h", - "scoped_ref_ptr.h", "scopedptrcollection.h", "sec_buffer.h", "sharedexclusivelock.cc", diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index 3ae76dbe45..23d8ffe165 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -113,9 +113,11 @@ 'random.h', 'ratetracker.cc', 'ratetracker.h', + 'refcount.h', 'safe_conversions.h', 'safe_conversions_impl.h', 'scoped_ptr.h', + 'scoped_ref_ptr.h', 'stringencode.cc', 'stringencode.h', 'stringutils.cc', @@ -311,14 +313,12 @@ 'proxyserver.h', 'ratelimiter.cc', 'ratelimiter.h', - 'refcount.h', 'referencecountedsingletonfactory.h', 'rollingaccumulator.h', 'rtccertificate.cc', 'rtccertificate.h', 'scoped_autorelease_pool.h', 'scoped_autorelease_pool.mm', - 'scoped_ref_ptr.h', 'scopedptrcollection.h', 'sec_buffer.h', 'sha1.cc', @@ -443,7 +443,6 @@ '../../webrtc_overrides/webrtc/base/win32socketinit.cc', ], 'sources!': [ - 'atomicops.h', 'bandwidthsmoother.cc', 'bandwidthsmoother.h', 'bind.h', @@ -495,13 +494,11 @@ 'profiler.h', 'proxyserver.cc', 'proxyserver.h', - 'refcount.h', 'referencecountedsingletonfactory.h', 'rollingaccumulator.h', 'safe_conversions.h', 'safe_conversions_impl.h', 'scopedptrcollection.h', - 'scoped_ref_ptr.h', 'sec_buffer.h', 'sharedexclusivelock.cc', 'sharedexclusivelock.h',