diff options
| author | Tapani Pälli <[email protected]> | 2017-08-01 14:23:00 +0300 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2017-08-02 10:32:48 +0300 |
| commit | f444ac5e6026d58b77ffada92698773127c734cd (patch) | |
| tree | 228f5c36231077d73230b3086663a6edda49d798 /src | |
| parent | 99c764b647c815533d45450e3a6f67ff192ee2af (diff) | |
android: export intermediates from libmesa_util
Fixes following build issues:
In file included from vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/common/dri_util.c:45:
vendor/intel/external/android_ia/mesa/src/util/xmlpool.h:103:10: fatal error: 'xmlpool/options.h' file not found
...
In file included from vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/intel_screen.c:44:
vendor/intel/external/android_ia/mesa/src/util/xmlpool.h:103:10: fatal error: 'xmlpool/options.h' file not found
Fixes: 601093f9 (xmlconfig: move into src/util)
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Chih-Wei Huang <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/common/Android.mk | 2 | ||||
| -rw-r--r-- | src/util/Android.mk | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/common/Android.mk b/src/mesa/drivers/dri/common/Android.mk index 573189d88f6..f15a3b9c786 100644 --- a/src/mesa/drivers/dri/common/Android.mk +++ b/src/mesa/drivers/dri/common/Android.mk @@ -46,6 +46,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ LOCAL_SRC_FILES := \ $(DRI_COMMON_FILES) +LOCAL_STATIC_LIBRARIES := libmesa_util + include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) diff --git a/src/util/Android.mk b/src/util/Android.mk index ecf3eb75740..7e54ae70134 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -51,6 +51,9 @@ LOCAL_MODULE := libmesa_util LOCAL_MODULE_CLASS := STATIC_LIBRARIES intermediates := $(call local-generated-sources-dir) + +LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) + UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES)) LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES) |