hack workaround to deal with the missing true/false keywords
and the new android buid process and BSP code base layout.

Change-Id: I76f13fb348a0d1fd1c02d0bfeee758ddd1372cc4
diff --git a/Android.mk b/Android.mk
index d0deed6..3e0347f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,7 @@
 
 VENDORS_INTEL_MRST_LIBMIX_ROOT := $(LOCAL_PATH)
 
-GLIB_TOP := external/glib
+GLIB_TOP := hardware/intel/glib
 
 include $(VENDORS_INTEL_MRST_LIBMIX_ROOT)/mix_common/src/Android.mk
 include $(VENDORS_INTEL_MRST_LIBMIX_ROOT)/mix_audio/src/Android.mk
diff --git a/mix_vbp/viddec_fw/fw/codecs/h264/parser/h264parse_dpb.c b/mix_vbp/viddec_fw/fw/codecs/h264/parser/h264parse_dpb.c
index 5ad9d09..d7be02f 100644
--- a/mix_vbp/viddec_fw/fw/codecs/h264/parser/h264parse_dpb.c
+++ b/mix_vbp/viddec_fw/fw/codecs/h264/parser/h264parse_dpb.c
@@ -1,4 +1,14 @@
 
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
+
 /*!
  ***********************************************************************
  *  \file: h264_dpb_ctl.c
diff --git a/mix_vbp/viddec_fw/fw/codecs/h264/parser/viddec_h264_parse.c b/mix_vbp/viddec_fw/fw/codecs/h264/parser/viddec_h264_parse.c
index a763d00..bc301da 100644
--- a/mix_vbp/viddec_fw/fw/codecs/h264/parser/viddec_h264_parse.c
+++ b/mix_vbp/viddec_fw/fw/codecs/h264/parser/viddec_h264_parse.c
@@ -1,3 +1,12 @@
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 #include "viddec_fw_debug.h"
 #include "viddec_parser_ops.h"
 
diff --git a/mix_vbp/viddec_fw/fw/include/stdint.h b/mix_vbp/viddec_fw/fw/include/stdint.h.bad.idea
similarity index 100%
rename from mix_vbp/viddec_fw/fw/include/stdint.h
rename to mix_vbp/viddec_fw/fw/include/stdint.h.bad.idea
diff --git a/mix_vbp/viddec_fw/fw/parser/main.c b/mix_vbp/viddec_fw/fw/parser/main.c
index 1bb368a..6b5f402 100644
--- a/mix_vbp/viddec_fw/fw/parser/main.c
+++ b/mix_vbp/viddec_fw/fw/parser/main.c
@@ -1,3 +1,12 @@
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 #include "fw_pvt.h"
 #include "viddec_fw_parser_ipclib_config.h"
 #include "viddec_fw_common_defs.h"
diff --git a/mix_vbp/viddec_fw/fw/parser/vbp_h264_parser.c b/mix_vbp/viddec_fw/fw/parser/vbp_h264_parser.c
index 1b6b3d6..90dea6a 100644
--- a/mix_vbp/viddec_fw/fw/parser/vbp_h264_parser.c
+++ b/mix_vbp/viddec_fw/fw/parser/vbp_h264_parser.c
@@ -6,6 +6,15 @@
  No license under any patent, copyright, trade secret or other intellectual property right is granted to or conferred upon you by disclosure or delivery of the Materials, either expressly, by implication, inducement, estoppel or otherwise. Any license under such intellectual property rights must be express and approved by Intel in writing.
  */
 
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 
 #include <glib.h>
 #include <dlfcn.h>
diff --git a/mix_vbp/viddec_fw/fw/parser/vbp_loader.c b/mix_vbp/viddec_fw/fw/parser/vbp_loader.c
index 27a2dd0..e7b4cd6 100644
--- a/mix_vbp/viddec_fw/fw/parser/vbp_loader.c
+++ b/mix_vbp/viddec_fw/fw/parser/vbp_loader.c
@@ -6,6 +6,16 @@
  No license under any patent, copyright, trade secret or other intellectual property right is granted to or conferred upon you by disclosure or delivery of the Materials, either expressly, by implication, inducement, estoppel or otherwise. Any license under such intellectual property rights must be express and approved by Intel in writing.
  */
 
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
+
 #include <glib.h>
 
 #include "vbp_loader.h"
diff --git a/mix_vbp/viddec_fw/fw/parser/vbp_mp42_parser.c b/mix_vbp/viddec_fw/fw/parser/vbp_mp42_parser.c
index cabdb29..47408dc 100644
--- a/mix_vbp/viddec_fw/fw/parser/vbp_mp42_parser.c
+++ b/mix_vbp/viddec_fw/fw/parser/vbp_mp42_parser.c
@@ -6,6 +6,15 @@
  No license under any patent, copyright, trade secret or other intellectual property right is granted to or conferred upon you by disclosure or delivery of the Materials, either expressly, by implication, inducement, estoppel or otherwise. Any license under such intellectual property rights must be express and approved by Intel in writing.
  */
 
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 
 #include <glib.h>
 #include <dlfcn.h>
diff --git a/mix_vbp/viddec_fw/fw/parser/vbp_utils.c b/mix_vbp/viddec_fw/fw/parser/vbp_utils.c
index e0a9806..c5d378d 100644
--- a/mix_vbp/viddec_fw/fw/parser/vbp_utils.c
+++ b/mix_vbp/viddec_fw/fw/parser/vbp_utils.c
@@ -7,6 +7,16 @@
  */
 
 
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
+
 #include <glib.h>
 #include <dlfcn.h>
 
diff --git a/mix_vbp/viddec_fw/fw/parser/vbp_vc1_parser.c b/mix_vbp/viddec_fw/fw/parser/vbp_vc1_parser.c
index 4af107a..5c05c83 100644
--- a/mix_vbp/viddec_fw/fw/parser/vbp_vc1_parser.c
+++ b/mix_vbp/viddec_fw/fw/parser/vbp_vc1_parser.c
@@ -7,6 +7,16 @@
  */
 
 
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
+
 #include <glib.h>
 #include <dlfcn.h>
 #include <string.h>
diff --git a/mix_vbp/viddec_fw/fw/parser/viddec_emit.c b/mix_vbp/viddec_fw/fw/parser/viddec_emit.c
index f6e6a8a..dc52e5c 100644
--- a/mix_vbp/viddec_fw/fw/parser/viddec_emit.c
+++ b/mix_vbp/viddec_fw/fw/parser/viddec_emit.c
@@ -1,3 +1,13 @@
+
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 #include "viddec_emitter.h"
 #include "viddec_fw_workload.h"
 #include "viddec_fw_debug.h"
diff --git a/mix_vbp/viddec_fw/fw/parser/viddec_pm.c b/mix_vbp/viddec_fw/fw/parser/viddec_pm.c
index ffcff11..6e0b66b 100644
--- a/mix_vbp/viddec_fw/fw/parser/viddec_pm.c
+++ b/mix_vbp/viddec_fw/fw/parser/viddec_pm.c
@@ -1,3 +1,13 @@
+
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 #include "viddec_pm.h"
 #include "viddec_fw_debug.h"
 #include "viddec_fw_common_defs.h"
diff --git a/mix_vbp/viddec_fw/fw/parser/viddec_pm_flush.c b/mix_vbp/viddec_fw/fw/parser/viddec_pm_flush.c
index f16fbcd..fb690a3 100644
--- a/mix_vbp/viddec_fw/fw/parser/viddec_pm_flush.c
+++ b/mix_vbp/viddec_fw/fw/parser/viddec_pm_flush.c
@@ -1,3 +1,12 @@
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 #include "fw_pvt.h"
 #include "viddec_fw_parser_ipclib_config.h"
 #include "viddec_fw_common_defs.h"
diff --git a/mix_vbp/viddec_fw/fw/parser/viddec_pm_parser_ops.c b/mix_vbp/viddec_fw/fw/parser/viddec_pm_parser_ops.c
index 6719ccf..10bb179 100644
--- a/mix_vbp/viddec_fw/fw/parser/viddec_pm_parser_ops.c
+++ b/mix_vbp/viddec_fw/fw/parser/viddec_pm_parser_ops.c
@@ -1,3 +1,13 @@
+
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 #include "viddec_pm.h"
 #include "viddec_fw_debug.h"
 #include "viddec_parser_ops.h"
diff --git a/mix_vbp/viddec_fw/fw/parser/viddec_pm_tags.c b/mix_vbp/viddec_fw/fw/parser/viddec_pm_tags.c
index b0d8842..eada1fa 100644
--- a/mix_vbp/viddec_fw/fw/parser/viddec_pm_tags.c
+++ b/mix_vbp/viddec_fw/fw/parser/viddec_pm_tags.c
@@ -1,3 +1,13 @@
+
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 #include "viddec_pm.h"
 #include "viddec_fw_debug.h"
 #include "viddec_fw_common_defs.h"
diff --git a/mix_vbp/viddec_fw/fw/parser/viddec_pm_utils_bstream.c b/mix_vbp/viddec_fw/fw/parser/viddec_pm_utils_bstream.c
index 31572a0..731a78e 100644
--- a/mix_vbp/viddec_fw/fw/parser/viddec_pm_utils_bstream.c
+++ b/mix_vbp/viddec_fw/fw/parser/viddec_pm_utils_bstream.c
@@ -1,3 +1,13 @@
+
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 #include "viddec_pm_utils_bstream.h"
 #include "viddec_fw_debug.h"
 
diff --git a/mix_vbp/viddec_fw/fw/parser/viddec_pm_utils_list.c b/mix_vbp/viddec_fw/fw/parser/viddec_pm_utils_list.c
index ccc83b3..164710e 100644
--- a/mix_vbp/viddec_fw/fw/parser/viddec_pm_utils_list.c
+++ b/mix_vbp/viddec_fw/fw/parser/viddec_pm_utils_list.c
@@ -1,3 +1,13 @@
+
+#ifdef ANDROID
+//#ifndef NULL
+//#define NULL (void*)0x0
+//#endif
+
+#define true 1
+#define false 0
+#endif
+
 #include "viddec_pm_utils_list.h"
 #include "viddec_fw_debug.h"