summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Urbanus <urbanus@google.com>2017-05-08 22:10:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-08 22:10:54 +0000
commita8916bf601bdbd962017d70d8a2ed651640e51e7 (patch)
treed81fbf3e39f873214595fd4b228eaa126172af76
parent23d9356cf80b8855dae0fe0f4ac7392aede46784 (diff)
parent3c4a94e84c950b4284e2d06a2773d94c3ea16215 (diff)
downloadlibchrome-a8916bf601bdbd962017d70d8a2ed651640e51e7.tar.gz
Make libchrome_test_helpers static buildable for host am: 394b004b77
am: 3c4a94e84c Change-Id: I9a7c01c806159b71ff1a37f11fc929df93035537
-rw-r--r--Android.bp8
1 files changed, 7 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index cdeca03c0e..b2b79f0f2c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -182,6 +182,7 @@ libchromeCommonSrc = [
"base/task_scheduler/sequence_sort_key.cc",
"base/task_scheduler/task.cc",
"base/task_scheduler/task_traits.cc",
+ "base/test/trace_event_analyzer.cc",
"base/third_party/icu/icu_utf.cc",
"base/third_party/nspr/prtime.cc",
"base/threading/non_thread_safe_impl.cc",
@@ -363,6 +364,7 @@ cc_library_static {
name: "libchrome_test_helpers",
defaults: ["libchrome-test-defaults"],
shared_libs: ["libchrome"],
+ host_supported: true,
srcs: [
"base/test/simple_test_clock.cc",
@@ -372,7 +374,11 @@ cc_library_static {
"base/test/test_switches.cc",
"base/test/test_timeouts.cc",
],
-
+ target: {
+ darwin: {
+ enabled: false,
+ },
+ },
}
// Helpers needed for unit tests (for host).