commit 0b9a6ace48374e0bcd13952b7e1f89cec3367257
author Lalit Maganti <lalitm@google.com> Fri Feb 16 18:05:06 2018 +0000
committer Lalit Maganti <lalitm@google.com> Fri Feb 16 18:10:20 2018 +0000
tree 04434354d91f0c84f27b48b46664d77f53e33644
parent 9c8a7f8cc190ebd174f5850d99f8274be46b027b

perfetto: fix dependencies for perfetto binary on standalone android

Also enable BUILD_WITH_ANDROID flag for perfetto integration tests

Change-Id: I0bf899ec26a43fd98bdc9b05e8490bf53fb7e6dd

Android.bp

diff --git a/Android.bp b/Android.bp
index 8a7eb3f..bee9d52 100644
--- a/Android.bp
+++ b/Android.bp
@@ -275,6 +275,7 @@
   cflags: [
     "-DGOOGLE_PROTOBUF_NO_RTTI",
     "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+    "-DPERFETTO_BUILD_WITH_ANDROID",
   ],
   product_variables: {
     pdk: {

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 6b38d69..4995177 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -87,6 +87,9 @@
       "src/ftrace_reader:ftrace_reader_integrationtests",
       "test:end_to_end_integrationtests",
     ]
+    if (build_with_android) {
+      cflags = [ "-DPERFETTO_BUILD_WITH_ANDROID" ]
+    }
   }
 
   if (monolithic_binaries) {
@@ -138,9 +141,11 @@
     sources = [
       "src/traced/perfetto_cmd/main.cc",
     ]
+    if (is_android) {
+      deps += [ "src/base:android_task_runner" ]
+    }
     if (build_with_android) {
       cflags = [ "-DPERFETTO_BUILD_WITH_ANDROID" ]
-      deps += [ "src/base:android_task_runner" ]
       libs = [
         "binder",
         "services",