Create Android.bp for epid_sdk.

am: 807f26b911

Change-Id: I2cda5ddf443e44e87993a25da85080f6736d536e

4 files changed, 263 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..e7a30f6
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,255 @@
+cc_defaults {
+    name: "epid_cflags",
+    host_supported: true,
+    cflags: [
+        "-Wno-missing-braces",
+        "-Wno-unknown-pragmas",
+        "-Wno-typedef-redefinition",
+        "-Wno-missing-field-initializers",
+        "-Wno-for-loop-analysis",
+        "-Wno-unused-const-variable",
+        "-fexceptions",
+        "-fPIC",
+        "-O2",
+    ],
+
+}
+
+cc_library {
+    name: "libippcp",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "ext/ipp/sources/ippcp/src/*.c",
+    ],
+    cflags: [
+        "-D_IPP_v50_",
+        "-D_IPP_DEBUG",
+        "-D_DISABLE_ALG_MD5_",
+        "-D_DISABLE_ALG_SM3_",
+    ],
+    local_include_dirs: [
+        "ext/ipp/sources/ippcp/",
+        "ext/ipp/sources/include/",
+    ],
+    export_include_dirs: [
+        "ext/ipp/include/",
+    ],
+}
+
+cc_library {
+    name: "libepid_common",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "epid/common/1.1/src/*.c",
+        "epid/common/math/src/*.c",
+        "epid/common/src/*.c",
+    ],
+    local_include_dirs: [
+        "epid/common/math/src",
+        "epid/common/math/",
+        "epid/common/src",
+    ],
+    static_libs: [
+        "libippcp",
+    ],
+}
+
+cc_library {
+    name: "libepid_member",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "epid/member/src/*.c",
+        "epid/member/tpm2/src/*.c",
+    ],
+    static_libs: [
+        "libepid_common",
+        "libippcp",
+    ],
+}
+
+cc_library {
+    name: "libepid_verifier",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "epid/verifier/1.1/src/*.c",
+        "epid/verifier/src/*.c",
+    ],
+    static_libs: [
+        "libepid_common",
+        "libippcp",
+    ],
+}
+
+cc_library {
+    name: "libepid_util",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "example/util/src/*.c",
+    ],
+    export_include_dirs: [
+        "example",
+    ],
+    static_libs: [
+        "libepid_common",
+    ],
+}
+
+cc_library {
+    name: "libargtable3",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "ext/argtable3/argtable3.c",
+    ],
+    export_include_dirs: [
+        "ext/argtable3",
+    ],
+}
+
+cc_library {
+    name: "libepid_common_testhelper",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "epid/common-testhelper/*cc",
+        "epid/common-testhelper/1.1/*cc",
+    ],
+    local_include_dirs: [
+        "ext",
+        "epid/common-testhelper/",
+        "epid/common-testhelper/1.1",
+    ],
+    static_libs: [
+        "libepid_member",
+        "libepid_verifier",
+        "libepid_common",
+        "libippcp",
+        "libgtest",
+    ],
+}
+
+cc_binary {
+    name: "epid_verifysig",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "example/verifysig/src/*.c",
+    ],
+    local_include_dirs: [
+        "example/verifysig",
+    ],
+    static_libs: [
+        "libepid_verifier",
+        "libepid_common",
+        "libepid_util",
+        "libippcp",
+        "libargtable3",
+    ],
+}
+
+cc_binary {
+    name: "epid_signmsg",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "example/signmsg/src/*.c",
+    ],
+    local_include_dirs: [
+        "example/signmsg",
+    ],
+    static_libs: [
+        "libepid_member",
+        "libepid_common",
+        "libepid_util",
+        "libippcp",
+        "libargtable3",
+    ],
+}
+
+cc_test {
+    name: "epid_common_testhelper_utest",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "epid/common-testhelper/unittests/*cc",
+    ],
+    local_include_dirs: [
+        "ext",
+    ],
+    static_libs: [
+        "libepid_common_testhelper",
+        "libepid_member",
+        "libepid_verifier",
+        "libepid_common",
+        "libippcp",
+    ],
+}
+
+cc_test {
+    name: "epid_common_utest",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "epid/common/math/unittests/*cc",
+        "epid/common/unittests/*cc",
+        "epid/common/1.1/unittests/*cc",
+    ],
+    local_include_dirs: [
+        "epid/common/unittests/",
+    ],
+    static_libs: [
+        "libepid_common_testhelper",
+        "libepid_member",
+        "libepid_verifier",
+        "libepid_common",
+        "libippcp",
+    ],
+}
+
+cc_test {
+    name: "epid_member_utest",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "epid/member/unittests/*cc",
+        "epid/member/tpm2/unittests/tpm2_wrapper-testhelper.cc",
+    ],
+    local_include_dirs: [
+        "ext",
+    ],
+    static_libs: [
+        "libepid_common_testhelper",
+        "libepid_verifier",
+        "libepid_member",
+        "libepid_common",
+        "libippcp",
+    ],
+}
+
+cc_test {
+    name: "epid_member_tpm2_utest",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "epid/member/tpm2/unittests/*.cc",
+    ],
+    exclude_srcs: [
+        "epid/member/tpm2/unittests/*tss-test.cc",
+    ],
+    static_libs: [
+        "libepid_common_testhelper",
+        "libepid_verifier",
+        "libepid_member",
+        "libepid_common",
+        "libippcp",
+
+    ],
+}
+
+cc_test {
+    name: "epid_verifier_utest",
+    defaults: ["epid_cflags"],
+    srcs: [
+        "epid/verifier/unittests/*cc",
+        "epid/verifier/1.1/unittests/*cc",
+    ],
+    static_libs: [
+        "libepid_common_testhelper",
+        "libepid_verifier",
+        "libepid_member",
+        "libepid_common",
+        "libippcp",
+    ],
+}
diff --git a/ext/argtable3/argtable3.c b/ext/argtable3/argtable3.c
index a551005..dfd136e 100644
--- a/ext/argtable3/argtable3.c
+++ b/ext/argtable3/argtable3.c
@@ -92,7 +92,7 @@ enum
 #ifdef __STDC_WANT_SECURE_LIB__
     EOVERFLOW_,
 #else
-    EOVERFLOW,
+    EOVERFLOW_,
 #endif
     EBADDOUBLE,
     EBADDATE,
@@ -2263,7 +2263,7 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 #ifdef __STDC_WANT_SECURE_LIB__
             errorcode = EOVERFLOW_;
 #else
-            errorcode = EOVERFLOW;
+            errorcode = EOVERFLOW_;
 #endif
 
         /* Detect any suffixes (KB,MB,GB) and multiply argument value appropriately. */
@@ -2274,7 +2274,7 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 #ifdef __STDC_WANT_SECURE_LIB__
                 errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
 #else
-                errorcode = EOVERFLOW;          /* Overflow would occur if we proceed */
+                errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
 #endif
             else
                 val *= 1024;                    /* 1KB = 1024 */
@@ -2285,7 +2285,7 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 #ifdef __STDC_WANT_SECURE_LIB__
                 errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
 #else
-                errorcode = EOVERFLOW;          /* Overflow would occur if we proceed */
+                errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
 #endif
             else
                 val *= 1048576;                 /* 1MB = 1024*1024 */
@@ -2296,7 +2296,7 @@ static int arg_int_scanfn(struct arg_int *parent, const char *argval)
 #ifdef __STDC_WANT_SECURE_LIB__
                 errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
 #else
-                errorcode = EOVERFLOW;          /* Overflow would occur if we proceed */
+                errorcode = EOVERFLOW_;          /* Overflow would occur if we proceed */
 #endif
             else
                 val *= 1073741824;              /* 1GB = 1024*1024*1024 */
@@ -2357,7 +2357,7 @@ static void arg_int_errorfn(
 #ifdef __STDC_WANT_SECURE_LIB__
     case EOVERFLOW_:
 #else
-    case EOVERFLOW:
+    case EOVERFLOW_:
 #endif
         fputs("integer overflow at option ", fp);
         arg_print_option(fp, shortopts, longopts, datatype, " ");
diff --git a/ext/ipp/sources/ippcp/src/pcphash_rmf.h b/ext/ipp/sources/ippcp/src/pcphash_rmf.h
index f4328f6..7a8a3a7 100644
--- a/ext/ipp/sources/ippcp/src/pcphash_rmf.h
+++ b/ext/ipp/sources/ippcp/src/pcphash_rmf.h
@@ -23,7 +23,7 @@
 */
 
 #if !defined(_PCP_HASH_RMF_H)
-#define __PCP_HASH_RMF_H
+#define _PCP_HASH_RMF_H
 
 #include "pcphash.h"
 #include "pcphashmethod_rmf.h"
diff --git a/ext/ipp/sources/ippcp/src/pcptool.h b/ext/ipp/sources/ippcp/src/pcptool.h
index 2d05b9e..7fc819c 100644
--- a/ext/ipp/sources/ippcp/src/pcptool.h
+++ b/ext/ipp/sources/ippcp/src/pcptool.h
@@ -24,7 +24,7 @@
 */
 
 #if !defined(_PC_TOOL_H)
-#define _CP_TOOL_H
+#define _PC_TOOL_H
 
 #define _NEW_COPY16_
 #define _NEW_XOR16_