<div dir="ltr">Sorry, my bad, I'll post a new revision incorporating Rob's review comment</div><div class="gmail_extra"> <div class="gmail_quote">2017-01-09 7:07 GMT+08:00 Mauro Rossi <<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>>: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">2017-01-06 18:35 GMT+01:00 Wu Zhen <<a href="mailto:wuzhen@jidemail.com">wuzhen@jidemail.com</a>>: > From: WuZhen <<a href="mailto:wuzhen@jidemail.com">wuzhen@jidemail.com</a>> > > this commit fixes mesa building on lollipop, however, > llvm on lollipop is too old to build amdgpu > > based on initial work by Mauro Rossi <<a href="mailto:issor.oruam@gmail.com">issor.oruam@gmail.com</a>> > > Change-Id: I98d646f9e1c61fe2754479382885718386a8bbb7 > Reviewed-by: Mauro Rossi <<a href="mailto:issor.oruam@gmail.com">issor.oruam@gmail.com</a>> > Reviewed-by: Chih-Wei Huang <<a href="mailto:cwhuang@linux.org.tw">cwhuang@linux.org.tw</a>> > --- > <a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> | 2 +- > Android.mk | 5 ++++- > src/gbm/Android.mk | 1 + > src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a> | 1 + > 4 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> b/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> > index 9f64c220f8..7ab3942ee2 100644 > --- a/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> > +++ b/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> > @@ -91,7 +91,7 @@ endif > endif > > LOCAL_CPPFLAGS += \ > - $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \ > + $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-std=c++11) \ > -Wno-error=non-virtual-dtor \ > -Wno-non-virtual-dtor > > diff --git a/Android.mk b/Android.mk > index fb29105a60..b52e7f8232 100644 > --- a/Android.mk > +++ b/Android.mk > @@ -95,10 +95,13 @@ SUBDIRS := \ > src/mesa \ > src/util \ > src/egl \ > - src/amd \ > src/intel \ > src/mesa/drivers/dri > > +ifneq ($(filter r300g r600g radeonsi, $(MESA_GPU_DRIVERS)),) > +SUBDIRS += src/amd > +endif > + > INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS)) > > ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) > diff --git a/src/gbm/Android.mk b/src/gbm/Android.mk > index a3f8fbbeab..89127766e6 100644 > --- a/src/gbm/Android.mk > +++ b/src/gbm/Android.mk > @@ -33,6 +33,7 @@ LOCAL_C_INCLUDES := \ > $(LOCAL_PATH)/main > > LOCAL_STATIC_LIBRARIES := libmesa_loader > +LOCAL_SHARED_LIBRARIES := libdl > LOCAL_MODULE := libgbm > > LOCAL_SRC_FILES := \ > diff --git a/src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a> b/src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a> > index 3905ddcf24..90e4ccd210 100644 > --- a/src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a> > +++ b/src/mesa/<a href="http://Android.libmesa_st_mesa.mk" rel="noreferrer" target="_blank">Android.libmesa_st_mesa.mk</a> > @@ -67,6 +67,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += \ > > LOCAL_STATIC_LIBRARIES += libmesa_nir libmesa_glsl > > +include external/libcxx/<a href="http://libcxx.mk" rel="noreferrer" target="_blank">libcxx.mk</a> </div></div>Hi, if I recall correctly, we reviewed an updated version, because <a href="http://libcxx.mk" rel="noreferrer" target="_blank">libcxx.mk</a> is not present in Android 6 and 7 (this would stop the android build) and stlport is used in kitkat Similar scenario in src/gallium/drivers/r600 and src/gallium/drivers/nouveau, has the following if/else/endif, and it works also here: +ifeq ($(MESA_LOLLIPOP_BUILD),true) +LOCAL_C_INCLUDES += external/libcxx/include +else +include external/stlport/<a href="http://libstlport.mk" rel="noreferrer" target="_blank">libstlport.mk</a> +endif NOTE: MESA_LOLLIPOP_BUILD currently has the meaning of "lollipop and later", equivalent to say "we're using c++11" <div class="HOEnZb"><div class="h5"> > include $(LOCAL_PATH)/<a href="http://Android.gen.mk" rel="noreferrer" target="_blank">Android.gen.mk</a> > include $(MESA_COMMON_MK) > include $(BUILD_STATIC_LIBRARY) > -- > 2.11.0 > </div></div></blockquote></div> </div>