diff options
| author | Bruce Beare <bruce.j.beare@intel.com> | 2012-06-22 10:53:59 -0700 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:02:47 -0700 |
| commit | 63eedead9dbf34cf7c1c60432508fbc0d9d5a0ec (patch) | |
| tree | 4b10d57838c7604de94000f609a88abf8d863818 /videocodec/Android.mk | |
| parent | 54272c0e474f97ac0269706170eb9161b36a9170 (diff) | |
| download | android_hardware_intel_common_omx-components-63eedead9dbf34cf7c1c60432508fbc0d9d5a0ec.tar.gz android_hardware_intel_common_omx-components-63eedead9dbf34cf7c1c60432508fbc0d9d5a0ec.tar.bz2 android_hardware_intel_common_omx-components-63eedead9dbf34cf7c1c60432508fbc0d9d5a0ec.zip | |
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: I569f912381873f3c2f024a6985088d3f5c4b2c5a
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Reviewed-on: http://android.intel.com:8080/56275
Reviewed-by: Li, XiaojingX <xiaojingx.li@intel.com>
Tested-by: Li, XiaojingX <xiaojingx.li@intel.com>
Diffstat (limited to 'videocodec/Android.mk')
| -rw-r--r-- | videocodec/Android.mk | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/videocodec/Android.mk b/videocodec/Android.mk index 76cd207..ac64cee 100644 --- a/videocodec/Android.mk +++ b/videocodec/Android.mk @@ -15,9 +15,8 @@ LOCAL_SHARED_LIBRARIES := \ libva-android LOCAL_C_INCLUDES := \ - $(WRS_OMXIL_CORE_ROOT)/utils/inc \ - $(WRS_OMXIL_CORE_ROOT)/base/inc \ - $(WRS_OMXIL_CORE_ROOT)/core/inc/khronos/openmax/include \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ $(TARGET_OUT_HEADERS)/libva @@ -45,9 +44,8 @@ LOCAL_SHARED_LIBRARIES := \ libva-android LOCAL_C_INCLUDES := \ - $(WRS_OMXIL_CORE_ROOT)/utils/inc \ - $(WRS_OMXIL_CORE_ROOT)/base/inc \ - $(WRS_OMXIL_CORE_ROOT)/core/inc/khronos/openmax/include \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ $(TARGET_OUT_HEADERS)/libva @@ -74,9 +72,8 @@ LOCAL_SHARED_LIBRARIES := \ libva-android LOCAL_C_INCLUDES := \ - $(WRS_OMXIL_CORE_ROOT)/utils/inc \ - $(WRS_OMXIL_CORE_ROOT)/base/inc \ - $(WRS_OMXIL_CORE_ROOT)/core/inc/khronos/openmax/include \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ $(TARGET_OUT_HEADERS)/libva @@ -104,9 +101,8 @@ LOCAL_SHARED_LIBRARIES := \ libva-android LOCAL_C_INCLUDES := \ - $(WRS_OMXIL_CORE_ROOT)/utils/inc \ - $(WRS_OMXIL_CORE_ROOT)/base/inc \ - $(WRS_OMXIL_CORE_ROOT)/core/inc/khronos/openmax/include \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ $(TARGET_OUT_HEADERS)/libva @@ -136,9 +132,8 @@ LOCAL_SHARED_LIBRARIES := \ libsharedbuffer LOCAL_C_INCLUDES := \ - $(WRS_OMXIL_CORE_ROOT)/utils/inc \ - $(WRS_OMXIL_CORE_ROOT)/base/inc \ - $(WRS_OMXIL_CORE_ROOT)/core/inc/khronos/openmax/include \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ $(TARGET_OUT_HEADERS)/libva \ $(TARGET_OUT_HEADERS)/libsharedbuffer @@ -169,9 +164,8 @@ LOCAL_SHARED_LIBRARIES := \ libsharedbuffer LOCAL_C_INCLUDES := \ - $(WRS_OMXIL_CORE_ROOT)/utils/inc \ - $(WRS_OMXIL_CORE_ROOT)/base/inc \ - $(WRS_OMXIL_CORE_ROOT)/core/inc/khronos/openmax/include \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ $(TARGET_OUT_HEADERS)/libva \ $(TARGET_OUT_HEADERS)/libsharedbuffer @@ -201,9 +195,8 @@ LOCAL_SHARED_LIBRARIES := \ libsharedbuffer LOCAL_C_INCLUDES := \ - $(WRS_OMXIL_CORE_ROOT)/utils/inc \ - $(WRS_OMXIL_CORE_ROOT)/base/inc \ - $(WRS_OMXIL_CORE_ROOT)/core/inc/khronos/openmax/include \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ $(TARGET_OUT_HEADERS)/libmix_videoencoder \ $(TARGET_OUT_HEADERS)/libva \ $(TARGET_OUT_HEADERS)/libsharedbuffer @@ -230,9 +223,8 @@ LOCAL_SHARED_LIBRARIES := \ libva-android LOCAL_C_INCLUDES := \ - $(WRS_OMXIL_CORE_ROOT)/utils/inc \ - $(WRS_OMXIL_CORE_ROOT)/base/inc \ - $(WRS_OMXIL_CORE_ROOT)/core/inc/khronos/openmax/include \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ $(TARGET_OUT_HEADERS)/libva @@ -261,9 +253,8 @@ LOCAL_SHARED_LIBRARIES := \ libsepdrm LOCAL_C_INCLUDES := \ - $(WRS_OMXIL_CORE_ROOT)/utils/inc \ - $(WRS_OMXIL_CORE_ROOT)/base/inc \ - $(WRS_OMXIL_CORE_ROOT)/core/inc/khronos/openmax/include \ + $(TARGET_OUT_HEADERS)/wrs_omxil_core \ + $(TARGET_OUT_HEADERS)/khronos/openmax \ $(PV_INCLUDES) \ $(TARGET_OUT_HEADERS)/libmix_videodecoder \ $(TARGET_OUT_HEADERS)/libva \ |