ScreenCapture for Android phase1, part II

content/browser/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/browser/browser.gni")
 import("//media/media_options.gni")
 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
 
@@ skipping 178 matching lines @@
                            ".",
                            "//content")
     deps += [
       "//jingle:jingle_glue",
       "//third_party/libjingle:libjingle_webrtc",
       "//third_party/webrtc",
       "//third_party/webrtc/base:rtc_base",
       "//third_party/webrtc/media:rtc_media",
       "//third_party/webrtc/modules/desktop_capture:primitives",
     ]
-    if (is_linux || is_mac || is_win) {
+    if (is_linux || is_mac || is_win || is_android) {

[Sergey Ulanov, 2016/08/19 05:54:15]

I think you want to keep this line as it was before - see my comments below. You
just need to define ENABLE_SCREEN_CAPTURE on all platforms (or get rid of it
completely)

[braveyao, 2016/08/23 21:18:54]

Done.

I suppose we still need to exclude ios, right?

       sources += [
         "media/capture/desktop_capture_device.cc",

[Sergey Ulanov, 2016/08/19 05:54:15]

This class is not useful on android (because you are not implementing
webrtc::DesktopCapturer interface).

[braveyao, 2016/08/23 21:18:54]

Done.

         "media/capture/desktop_capture_device.h",
       ]
       if (use_aura) {
         sources += [
           "media/capture/aura_window_capture_machine.cc",
           "media/capture/aura_window_capture_machine.h",
           "media/capture/desktop_capture_device_aura.cc",
           "media/capture/desktop_capture_device_aura.h",
         ]
       }
       defines += [ "ENABLE_SCREEN_CAPTURE=1" ]

[Sergey Ulanov, 2016/08/19 05:54:15]

Just move this line out of the if block or remove this define completely (since
now screen capture enabled on all platforms)

[braveyao, 2016/08/23 21:18:55]

Done.

       deps += [ "//third_party/webrtc/modules/desktop_capture" ]

[Sergey Ulanov, 2016/08/19 05:54:15]

don't really need this on Android.

[braveyao, 2016/08/23 21:18:55]

Done.

     }
   }
 
   if (is_win) {
     sources -= [ "device_sensors/data_fetcher_shared_memory_default.cc" ]
     defines += [
       # This prevents the inclusion of atlhost.h which paired
       # with the windows 8 sdk it does the wrong thing.
       "__ATLHOST_H__",
     ]
@@ skipping 284 matching lines @@
   if (!is_component_build) {
     public_deps = [
       ":browser",
     ]
   } else {
     public_deps = [
       "//third_party/leveldatabase",
     ]
   }
 }