[Android] [PATCH 4/6] build: fix java dependencies

[Jean-Baptiste Kempf]

On 21 Oct, Thomas Guillem wrote :
> On Tue, Oct 21, 2014, at 11:55, Jean-Baptiste Kempf wrote:
> > On 21 Oct, Thomas Guillem wrote :
> > > ---
> > >  Makefile | 14 ++------------
> > >  1 file changed, 2 insertions(+), 12 deletions(-)
> > > 
> > > diff --git a/Makefile b/Makefile
> > > index 6b3bcda..dc92c38 100644
> > > --- a/Makefile
> > > +++ b/Makefile
> > > @@ -5,18 +5,8 @@ export ANDROID_HOME=$(ANDROID_SDK)
> > >  ARCH = $(ANDROID_ABI)
> > >  
> > >  SRC=vlc-android
> > > -JAVA_SOURCES=\
> > > -	$(SRC)/src/org/videolan/vlc/*.java \
> > > -	$(SRC)/src/org/videolan/vlc/util/*.java \
> > > -	$(SRC)/src/org/videolan/vlc/gui/*.java \
> > > -	$(SRC)/src/org/videolan/vlc/gui/expandable/*.java \
> > > -	$(SRC)/src/org/videolan/vlc/gui/video/*.java \
> > > -	$(SRC)/src/org/videolan/vlc/gui/audio/*.java \
> > > -	$(SRC)/src/org/videolan/vlc/gui/audio/widget/*.java \
> > > -	$(SRC)/src/org/videolan/vlc/interfaces/*.java \
> > > -	$(SRC)/src/org/videolan/vlc/audio/*.java \
> > > -	$(SRC)/src/org/videolan/vlc/widget/*.java \
> > > -	$(SRC)/src/org/videolan/libvlc/*.java
> > > +JAVA_SOURCES=$(shell find $(SRC)/src -type f)
> > > +JAVA_SOURCES+=$(shell find $(SRC)/res -type f)
> > 
> > This is far from being the same.
> > Why not find in src only the java parts?
> 
> Because you can have others file than java like aidl.
> 
> > Why not find in src only in the org/videolan folders?
> 
> Do you prefer something like the following ?
> 
> JAVA_SOURCES=$(shell find $(SRC)/src/org/videolan/ -name "*.java" -o
> -name "*.aidl")
> JAVA_SOURCES+=$(shell find $(SRC)/res -name "*.xml" -o -name "*.png")

Yes.

With my kindest regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device