commit 3d5e7e672583bd8a20c4429045638b5283ab97b3
author Florian Mayer <fmayer@google.com> Fri Jan 19 15:22:46 2018 +0000
committer Florian Mayer <fmayer@google.com> Fri Jan 19 15:22:46 2018 +0000
tree 3ed4b6d87ef24d7adcdb091607ee15bd9f5aad53
parent a65d75c33609a5ce3a828d8f261ac60cdd5bee44

Propagate defines to Android.pb

In particular this propagates -DGOOGLE_PROTOBUF_NO_[RTTI|STATIC_INITIALIZERS].
This saves another ~30K on ARM64.

Change-Id: Id4f7ac9d2013e7c3f3fa0fd9014f5a8e4617d43e
Bug: 71844955

Android.bp

diff --git a/Android.bp b/Android.bp
index e4aa102..5a9fd39 100644
--- a/Android.bp
+++ b/Android.bp
@@ -78,6 +78,10 @@
   defaults: [
     "perfetto_defaults",
   ],
+  cflags: [
+    "-DGOOGLE_PROTOBUF_NO_RTTI",
+    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+  ],
 }
 
 // GN target: //:perfetto
@@ -143,6 +147,8 @@
     "perfetto_defaults",
   ],
   cflags: [
+    "-DGOOGLE_PROTOBUF_NO_RTTI",
+    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
     "-DPERFETTO_BUILD_WITH_ANDROID",
   ],
 }
@@ -511,6 +517,10 @@
   defaults: [
     "perfetto_defaults",
   ],
+  cflags: [
+    "-DGOOGLE_PROTOBUF_NO_RTTI",
+    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+  ],
 }
 
 // GN target: //src/ipc:test_messages_gen
@@ -608,6 +618,10 @@
   defaults: [
     "perfetto_defaults",
   ],
+  cflags: [
+    "-DGOOGLE_PROTOBUF_NO_RTTI",
+    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+  ],
 }
 
 // GN target: //src/protozero:testing_messages_lite_gen
@@ -774,6 +788,10 @@
   defaults: [
     "perfetto_defaults",
   ],
+  cflags: [
+    "-DGOOGLE_PROTOBUF_NO_RTTI",
+    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+  ],
 }
 
 // GN target: //:perfetto_tests
@@ -890,6 +908,10 @@
   defaults: [
     "perfetto_defaults",
   ],
+  cflags: [
+    "-DGOOGLE_PROTOBUF_NO_RTTI",
+    "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
+  ],
 }
 
 // GN target: //:traced