Undef before redefining macros

-Werror,-Wmacro-redefined was turned on because of -Werror, -Wall.
Undefine the overridden macros before redefining them to let compiler
know that the redifinition is intentional.

Test: m -j sh_vendor

Change-Id: If324124e4504f05a37afd1021cff179fdfe4c08e

diff --git a/Android.bp b/Android.bp
index 25d0882..2ddb748 100644 (file)
--- a/Android.bp
+++ b/Android.bp
@@ -120,6 +120,9 @@ cc_defaults {
         vendor: {
             cflags: [
                 // Additional flags for vendor variant
+                "-UMKSH_DEFAULT_PROFILEDIR",
+                "-UMKSHRC_PATH",
+                "-UMKSH_DEFAULT_EXECSHELL",
                 "-DMKSH_DEFAULT_PROFILEDIR=\"/vendor/etc\"",
                 "-DMKSHRC_PATH=\"/vendor/etc/mkshrc\"",
                 "-DMKSH_DEFAULT_EXECSHELL=\"/vendor/bin/sh\"",