commit 1a48a036ad0694b3c412b315d0c29c1630c86040
author Andrew Scull <ascull@google.com> Tue Sep 26 17:33:22 2017 +0100
committer Andrew Scull <ascull@google.com> Tue Sep 26 16:36:45 2017 +0000
tree 1286a22fe642b79a5e8b9780ed6c4aa9804e3a19
parent bdcfaa8a84e1dd90cc45fc28eae098d5c3cd5f10

Fix the build for Android.

- Protobuf generated code needs a warning supressed.
- The generator tests will be moved to the bazel bulid in future

Test: mm
Change-Id: I5ae5bbdddfbdf555a7734b9a83e35b0e62caae3a

Android.bp

diff --git a/Android.bp b/Android.bp
index 3f2409e..c45648d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -31,7 +31,10 @@
 
 cc_defaults {
     name: "nos_app_defaults",
-    cflags: ["-Wno-unused-parameter"],
+    cflags: [
+        "-Wno-extended-offsetof",
+        "-Wno-unused-parameter",
+    ],
     header_libs: ["nos_headers"],
     shared_libs: ["libnos"],
 }

libnos/generator/test/Android.bp

diff --git a/libnos/generator/test/Android.bp b/libnos/generator/test/Android.bp
index f0325b3..2cf5255 100644
--- a/libnos/generator/test/Android.bp
+++ b/libnos/generator/test/Android.bp
@@ -19,7 +19,7 @@
     out: ["Hello.client.cpp"],
     srcs: ["test.proto"],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
-    cmd: GEN_SERVICE_SOURCE + "-Iexternal/libnos/generator/test",
+    cmd: GEN_SERVICE_SOURCE + "-Iexternal/libnos/libnos/generator/test",
 }
 
 genrule {
@@ -27,7 +27,7 @@
     out: ["Hello.client.h"],
     srcs: ["test.proto"],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
-    cmd: GEN_SERVICE_HEADER + "-Iexternal/libnos/generator/test",
+    cmd: GEN_SERVICE_HEADER + "-Iexternal/libnos/libnos/generator/test",
 }
 
 genrule {
@@ -35,7 +35,7 @@
     out: ["MockHello.client.h"],
     srcs: ["test.proto"],
     tools: ["aprotoc", "protoc-gen-nos-client-cpp"],
-    cmd: GEN_SERVICE_MOCK + "-Iexternal/libnos/generator/test",
+    cmd: GEN_SERVICE_MOCK + "-Iexternal/libnos/libnos/generator/test",
 }
 
 cc_test_host {