commit e9caa68fdb16b7562e3b4b6c9bb8ad5658ff9a08
author Bruce Beare <bruce.j.beare@intel.com> Fri Jun 22 10:53:59 2012 -0700
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 22:01:46 2014 -0700
tree a869aa9a941df5497162979e3587301ab93757ab
parent 8acea2d0d04b7aff3fb59bb071cc7a69c47b9929

build: Clean up use of include files

BZ: 43321

Projects should not refer to header files in other projects directly
(since projects can be moved around). Instead... headers should be
published into the out/ directory and found there when needed.

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

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 237ead9..3232efe 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -1,7 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
-
 LOCAL_SRC_FILES:=          \
    wsbm_driver.c           \
    wsbm_fencemgr.c         \
@@ -13,14 +12,21 @@
    wsbm_userpool.c
 
 LOCAL_CFLAGS += -DHAVE_CONFIG_H
-
 LOCAL_C_INCLUDES :=            \
    $(LOCAL_PATH)/../       \
-   $(TOPDIR)hardware/intel/include/drm \
+   $(TARGET_OUT_HEADERS)/drm \
+   $(TARGET_OUT_HEADERS)/ipp \
+   $(TARGET_OUT_HEADERS)/libdrm \
+   $(TARGET_OUT_HEADERS)/libdrm/shared-core \
    $(TARGET_OUT_HEADERS)/libttm
 
-LOCAL_COPY_HEADERS_TO := libwsbm/wsbm
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE:= libwsbm
+LOCAL_SHARED_LIBRARIES:= libdrm
+include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_COPY_HEADERS_TO := libwsbm/wsbm
 LOCAL_COPY_HEADERS :=          \
    wsbm_atomic.h           \
    wsbm_driver.h           \
@@ -30,10 +36,4 @@
    wsbm_pool.h         \
    wsbm_priv.h         \
    wsbm_util.h
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= libwsbm
-
-LOCAL_SHARED_LIBRARIES:= libdrm
-
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_COPY_HEADERS)