| Index: base/BUILD.gn | 
| diff --git a/base/BUILD.gn b/base/BUILD.gn | 
| index 28967dbf617eaeb1f1b4e6dc02c867f0c888d7a1..c09946b139b52621c944dc66d172103cc7614eb1 100644 | 
| --- a/base/BUILD.gn | 
| +++ b/base/BUILD.gn | 
| @@ -714,11 +714,41 @@ component("base") { | 
| ] | 
|  | 
| if (is_android) { | 
| +    sources += [ | 
| +       "memory/discardable_memory_ashmem_allocator.cc", | 
| +       "memory/discardable_memory_ashmem_allocator.h", | 
| +       "memory/discardable_memory_ashmem.cc", | 
| +       "memory/discardable_memory_ashmem.h", | 
| +    ] | 
| +    sources -= [ | 
| +      "base_paths_posix.cc", | 
| +      "power_monitor/power_monitor_device_source_posix.cc", | 
| +    ] | 
| + | 
| +    # Android uses some Linux sources, put those back. | 
| +    set_sources_assignment_filter([]) | 
| +    sources += [ | 
| +      "debug/proc_maps_linux.cc", | 
| +      "files/file_path_watcher_linux.cc", | 
| +      "process/memory_linux.cc", | 
| +      "process/internal_linux.cc", | 
| +      "process/process_handle_linux.cc", | 
| +      "process/process_iterator_linux.cc", | 
| +      "process/process_metrics_linux.cc", | 
| +      "posix/unix_domain_socket_linux.cc", | 
| +      "sys_info_linux.cc", | 
| +    ] | 
| +    set_sources_assignment_filter(sources_assignment_filter) | 
| + | 
| deps += [ | 
| ":base_jni_headers", | 
| +      "//third_party/ashmem", | 
| "//third_party/android_tools:cpu_features" | 
| ] | 
|  | 
| +    # logging.cc uses the Android logging library. | 
| +    libs = [ "log" ] | 
| + | 
| sources -= [ | 
| "debug/stack_trace_posix.cc", | 
| ] | 
| @@ -799,15 +829,13 @@ component("base") { | 
| configs += linux_configs | 
| all_dependent_configs = linux_configs | 
|  | 
| -    if (!is_android) { | 
| -      # These dependencies are not required on Android, and in the case | 
| -      # of xdg_mime must be excluded due to licensing restrictions. | 
| -      deps += [ | 
| -        "//base/third_party/symbolize", | 
| -        "//base/third_party/xdg_mime", | 
| -        "//base/third_party/xdg_user_dirs", | 
| -      ] | 
| -    } | 
| +    # These dependencies are not required on Android, and in the case | 
| +    # of xdg_mime must be excluded due to licensing restrictions. | 
| +    deps += [ | 
| +      "//base/third_party/symbolize", | 
| +      "//base/third_party/xdg_mime", | 
| +      "//base/third_party/xdg_user_dirs", | 
| +    ] | 
| } else { | 
| # Non-Linux. | 
| sources -= [ | 
|  |