summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Urbanus <urbanus@google.com>2017-05-08 22:14:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-08 22:14:49 +0000
commit47f0958c5591c077286a9e9480a25c95f4f748b6 (patch)
treea8e9ebc48716305d3f1a9f7f03aca432d1486b52
parent6890627dcb6148ec3d22567fc52db2fd29951dc4 (diff)
parenta8916bf601bdbd962017d70d8a2ed651640e51e7 (diff)
downloadlibchrome-47f0958c5591c077286a9e9480a25c95f4f748b6.tar.gz
Make libchrome_test_helpers static buildable for host am: 394b004b77 am: 3c4a94e84c
am: a8916bf601 Change-Id: I0ddbd54362bb7022426f39f781d83d19e85ebdae
-rw-r--r--Android.bp8
1 files changed, 7 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 733dfb6b9f..248215e185 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",
@@ -355,6 +356,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",
@@ -364,7 +366,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).