commit 611427a217c0ed24b1c0e87975dab66cdd7ce1be
author Bruce Beare <bruce.j.beare@intel.com> Fri Jul 13 20:49:35 2012 -0700
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 21:51:29 2014 -0700
tree b1ff456a1b91b5c5a132fb1547ee7c5fca6ca893
parent 25933e9c3f5a5e8227c1c2c06f50104fe2fa9cb4

build: make various subsystems selectable

BZ: 46710

For bringup and support of various hardware, we need to be able to disable
intel add-on's in a convenient way via BoardConfig.mk. This commit adds
required fixes to various Android.mk files.

BoardConfig.mk is also changed disable a number of subsystems for bring-up
of JB

Change-Id: Id976736d07966e8948256ed462ad148246a05bbb
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Reviewed-on: http://android.intel.com:8080/56382
Reviewed-by: Li, XiaojingX <xiaojingx.li@intel.com>
Tested-by: Li, XiaojingX <xiaojingx.li@intel.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index baf7b48..0ed1c8a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,8 @@
 LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
 
+ifeq ($(INTEL_VA),true)
+
+include $(CLEAR_VARS)
 VENDORS_INTEL_MRST_LIBMIX_ROOT := $(LOCAL_PATH)
 
 include $(VENDORS_INTEL_MRST_LIBMIX_ROOT)/mix_common/src/Android.mk
@@ -10,3 +12,5 @@
 include $(VENDORS_INTEL_MRST_LIBMIX_ROOT)/asfparser/Android.mk
 include $(VENDORS_INTEL_MRST_LIBMIX_ROOT)/videodecoder/Android.mk
 include $(VENDORS_INTEL_MRST_LIBMIX_ROOT)/videoencoder/Android.mk
+
+endif