Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(606)

Unified Diff: base/BUILD.gn

Issue 275703003: Make GN Android build link executables (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: whitespace Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 3d07813a6d28a1d580574a3af0bfc15d983db69e..b6118140804ba15a6b5b17670c963e3c7db19042 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -714,11 +714,40 @@ 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([])
scottmg 2014/05/12 16:33:58 ick, how is this scoped? can you not have them rem
brettw 2014/05/12 18:06:41 This is the only solution now. I could put the fil
cjhopman 2014/05/12 18:37:17 Maybe there should be a way that something like th
brettw 2014/05/12 21:00:08 Okay, I put it back, although I was avoiding this
+ 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",
+ ]
+
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 +828,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 -= [
« no previous file with comments | « BUILD.gn ('k') | build/config/BUILDCONFIG.gn » ('j') | build/config/android/config.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698