diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-03 19:50:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-03 19:50:36 +0000 |
| commit | 2ddfd6407e67a389d05a5a5643a173f2f466d8cd (patch) | |
| tree | c2e717e009dbf34f800107e2e239c0f549ff9524 | |
| parent | 4758d019853202d3da2d672b16b8f9010f02e25c (diff) | |
| parent | 553b764daad96489984f511d30af8aa6f5b6bbf2 (diff) | |
| download | extras-2ddfd6407e67a389d05a5a5643a173f2f466d8cd.tar.gz | |
Merge "Perfprofd: Place darwin disable into general defaults" into pi-dev
| -rw-r--r-- | perfprofd/Android.bp | 16 | ||||
| -rw-r--r-- | perfprofd/dropbox/Android.bp | 3 | ||||
| -rw-r--r-- | perfprofd/tests/Android.bp | 3 |
3 files changed, 6 insertions, 16 deletions
diff --git a/perfprofd/Android.bp b/perfprofd/Android.bp index eb35a039..256b95cf 100644 --- a/perfprofd/Android.bp +++ b/perfprofd/Android.bp @@ -39,6 +39,12 @@ cc_defaults { "-Wno-sign-compare", "-Wno-unused-parameter", ], + + target: { + darwin: { + enabled: false, + }, + }, } cc_defaults { @@ -59,11 +65,6 @@ cc_library_static { "perfprofd_defaults", ], host_supported: true, - target: { - darwin: { - enabled: false, - }, - }, static_libs: [ "libbase", @@ -96,11 +97,6 @@ cc_defaults { "perfprofd_defaults", ], host_supported: true, - target: { - darwin: { - enabled: false, - }, - }, static_libs: [ "libbase", diff --git a/perfprofd/dropbox/Android.bp b/perfprofd/dropbox/Android.bp index 9f55fbae..c3b8f3b8 100644 --- a/perfprofd/dropbox/Android.bp +++ b/perfprofd/dropbox/Android.bp @@ -43,9 +43,6 @@ cc_library_static { "libservices", ], }, - darwin: { - enabled: false, - }, host: { srcs: [ "dropbox_host.cc", diff --git a/perfprofd/tests/Android.bp b/perfprofd/tests/Android.bp index 50d9ca83..742ec556 100644 --- a/perfprofd/tests/Android.bp +++ b/perfprofd/tests/Android.bp @@ -36,9 +36,6 @@ cc_test { "liblog", ], target: { - darwin: { - enabled: false, - }, host: { host_ldlibs: [ "-lncurses", |