From b03f93d883f2f5591d5f85aa40cca1dccd9dfe34 Mon Sep 17 00:00:00 2001
From: xianju6x <xianjunx.zheng@intel.com>
Date: Thu, 23 Apr 2020 11:49:05 +0800
Subject: [PATCH 1/2] safestringlib: add an Android.bp file

Change-Id: Ieefa205759290f0e6aac4d9141e254438c4d65eb
Tracked-On: OAM-90643
Signed-off-by: Xianjun Zheng xianjunx.zheng@intel.com
---
 Android.bp | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..b9d35e2
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,129 @@
+cc_defaults {
+    name: "safestringlib_defaults",
+    cflags: [
+        "-Wall",
+        "-DSTDC_HEADERS",
+        "-fstack-protector-strong",
+        "-O2",
+        "-D_FORTIFY_SOURCE=2",
+        "-fPIE",
+        "-fPIC",
+        "-Wformat",
+        "-Wformat-security",
+        "-Wno-unused-parameter",
+        "-Wno-pointer-sign",
+    ],
+    ldflags: [
+        "-z noexecstack",
+        "-z relro",
+        "-z now",
+    ],
+}
+
+cc_defaults {
+    name: "safestringlib_sources",
+    srcs: [
+        "safeclib/abort_handler_s.c",
+        "safeclib/ignore_handler_s.c",
+        "safeclib/memcmp16_s.c",
+        "safeclib/memcmp32_s.c",
+        "safeclib/memcmp_s.c",
+        "safeclib/memcpy16_s.c",
+        "safeclib/memcpy32_s.c",
+        "safeclib/memcpy_s.c",
+        "safeclib/memmove16_s.c",
+        "safeclib/memmove32_s.c",
+        "safeclib/memmove_s.c",
+        "safeclib/mem_primitives_lib.c",
+        "safeclib/memset16_s.c",
+        "safeclib/memset32_s.c",
+        "safeclib/memset_s.c",
+        "safeclib/memzero16_s.c",
+        "safeclib/memzero32_s.c",
+        "safeclib/memzero_s.c",
+        "safeclib/safe_mem_constraint.c",
+        "safeclib/safe_str_constraint.c",
+        "safeclib/snprintf_support.c",
+        "safeclib/stpcpy_s.c",
+        "safeclib/stpncpy_s.c",
+        "safeclib/strcasecmp_s.c",
+        "safeclib/strcasestr_s.c",
+        "safeclib/strcat_s.c",
+        "safeclib/strcmpfld_s.c",
+        "safeclib/strcmp_s.c",
+        "safeclib/strcpyfldin_s.c",
+        "safeclib/strcpyfldout_s.c",
+        "safeclib/strcpyfld_s.c",
+        "safeclib/strcpy_s.c",
+        "safeclib/strcspn_s.c",
+        "safeclib/strfirstchar_s.c",
+        "safeclib/strfirstdiff_s.c",
+        "safeclib/strfirstsame_s.c",
+        "safeclib/strisalphanumeric_s.c",
+        "safeclib/strisascii_s.c",
+        "safeclib/strisdigit_s.c",
+        "safeclib/strishex_s.c",
+        "safeclib/strislowercase_s.c",
+        "safeclib/strismixedcase_s.c",
+        "safeclib/strispassword_s.c",
+        "safeclib/strisuppercase_s.c",
+        "safeclib/strlastchar_s.c",
+        "safeclib/strlastdiff_s.c",
+        "safeclib/strlastsame_s.c",
+        "safeclib/strljustify_s.c",
+        "safeclib/strncat_s.c",
+        "safeclib/strncpy_s.c",
+        "safeclib/strnlen_s.c",
+        "safeclib/strnterminate_s.c",
+        "safeclib/strpbrk_s.c",
+        "safeclib/strprefix_s.c",
+        "safeclib/strremovews_s.c",
+        "safeclib/strspn_s.c",
+        "safeclib/strstr_s.c",
+        "safeclib/strtok_s.c",
+        "safeclib/strtolowercase_s.c",
+        "safeclib/strtouppercase_s.c",
+        "safeclib/strzero_s.c",
+        "safeclib/wcpcpy_s.c",
+        "safeclib/wcscat_s.c",
+        "safeclib/wcscpy_s.c",
+        "safeclib/wcsncat_s.c",
+        "safeclib/wcsncpy_s.c",
+        "safeclib/wcsnlen_s.c",
+        "safeclib/wmemcmp_s.c",
+        "safeclib/wmemcpy_s.c",
+        "safeclib/wmemmove_s.c",
+        "safeclib/wmemset_s.c",
+    ],
+}
+
+cc_library_shared {
+    name: "libsafestring",
+    defaults: [
+        "safestringlib_defaults",
+        "safestringlib_sources",
+    ],
+    vendor: true,
+    include_dirs: [
+        "hardware/intel/external/safestringlib/include",
+    ],
+	export_include_dirs: [
+		"include",
+	],
+}
+
+
+cc_library_static {
+    name: "libsafestring_static",
+    defaults: [
+        "safestringlib_defaults",
+        "safestringlib_sources",
+    ],
+	vendor_available: true,
+    include_dirs: [
+        "hardware/intel/external/safestringlib/include",
+    ],
+	export_include_dirs: [
+		"include",
+	],
+}

From 28f2c1488c3d896d1daf1d0dee4b62c9a0b7d697 Mon Sep 17 00:00:00 2001
From: xianju6x <xianjunx.zheng@intel.com>
Date: Fri, 24 Apr 2020 11:19:34 +0800
Subject: [PATCH 2/2] Android.bp : remove -Wno-pointer-sign

Change-Id: I3a04b147b50c01387f8ca42c8452a13cc0a1c408
Tracked-On: OAM-90643
Signed-off-by: Xianjun Zheng xianjunx.zheng@intel.com
---
 Android.bp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index b9d35e2..5d0163e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,7 +11,6 @@ cc_defaults {
         "-Wformat",
         "-Wformat-security",
         "-Wno-unused-parameter",
-        "-Wno-pointer-sign",
     ],
     ldflags: [
         "-z noexecstack",