summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2018-03-30 11:45:14 -0700
committerAndreas Gampe <agampe@google.com>2018-04-02 20:30:31 -0700
commit553b764daad96489984f511d30af8aa6f5b6bbf2 (patch)
tree5008c5393c11e41bc654394f10f0364f1ab742e0
parent6ebf8824e2eda039168cff05684590e5b3a98bff (diff)
downloadextras-553b764daad96489984f511d30af8aa6f5b6bbf2.tar.gz
Perfprofd: Place darwin disable into general defaults
Avoid further Mac breakage. (cherry picked from commit 2230fb2d54ef4cc841c3347e8975320d621488a3) Bug: 73175642 Test: mmma system/extras/perfprofd Test: perfprofd_test Merged-In: I3b4db7d363c69b5e4249223d8cb185a4e9eef5cf Change-Id: I3b4db7d363c69b5e4249223d8cb185a4e9eef5cf
-rw-r--r--perfprofd/Android.bp16
-rw-r--r--perfprofd/dropbox/Android.bp3
-rw-r--r--perfprofd/tests/Android.bp3
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",