Reland of Modify profiles for H264 encode SW fallback

webrtc/media/BUILD.gn

Index: webrtc/media/BUILD.gn
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index dcb5247d08913ad1e96ab9b0553fa89fc2909d37..66fce0b3d72f2973ce09c620b61f0501c9d7b8c2 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -61,6 +61,7 @@ rtc_static_library("rtc_media_base") {
   defines = []
   libs = []
   deps = []
+  public_deps = []
   sources = [
     "base/adaptedvideotracksource.cc",
     "base/adaptedvideotracksource.h",
@@ -108,16 +109,13 @@ rtc_static_library("rtc_media_base") {
   include_dirs = []
   if (rtc_build_libyuv) {
     deps += [ "$rtc_libyuv_dir" ]
-    public_deps = [
-      "$rtc_libyuv_dir",
-    ]
+    public_deps += [ "$rtc_libyuv_dir" ]
   } else {
     # Need to add a directory normally exported by libyuv.
     include_dirs += [ "$rtc_libyuv_dir/include" ]
   }
 
   deps += [
-    ":rtc_h264_profile_id",
     "..:webrtc_common",
     "../api:libjingle_peerconnection_api",
     "../p2p",
@@ -125,6 +123,8 @@ rtc_static_library("rtc_media_base") {
     "../rtc_base:rtc_base_approved",
   ]
 
+  public_deps += [ ":rtc_h264_profile_id" ]
+
   if (is_nacl) {
     deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
   }