commit 23b75a4d658c40ebc2aa51d447f43bc132868fc1
author Florian Mayer <fmayer@google.com> Thu Jul 30 15:21:25 2020 +0100
committer Florian Mayer <fmayer@google.com> Thu Jul 30 15:21:25 2020 +0100
tree cda96c591327d3e8c98f7774ce2db40fa66fc52f
parent 976db5baa78bb36ddb6763c9c4629ad7b95f0ad4

Build standalone client using static STL.

Change-Id: I487c801a7d4c0cd85502738d934ff05de02414fa
Bug: 160400319

Android.bp

diff --git a/Android.bp b/Android.bp
index 26fd9df..a682da4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -434,6 +434,7 @@
     "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
     "-DPERFETTO_ANDROID_ASYNC_SAFE_LOG",
   ],
+  stl: "libc++_static",
   version_script: "src/profiling/memory/heapprofd_client_api.map.txt",
 }
 

tools/gen_android_bp

diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index 680c02e..5e61182 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -180,6 +180,7 @@
     'heapprofd_standalone_client': [
         ('static_libs', {'libasync_safe'}),
         ('version_script', 'src/profiling/memory/heapprofd_client_api.map.txt'),
+        ('stl', 'libc++_static'),
     ],
     'perfetto_unittests': [
         ('data', set(enumerate_data_deps())),