Let's simplify the paths and be less 'experimental'

android/Bootstrap/Makefile.shared

@@ -59,7 +59,7 @@ prepare-appcompat:
 
 properties:
 	echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
-	echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties
+	echo sdk.dir=$(ANDROID_SDK_HOME) >../Bootstrap/local.properties
 	echo "# File needed by ndk-gdb" >jni/Application.mk
 	echo "APP_ABI := $(ANDROID_APP_ABI)" > jni/Application.mk
 	echo "APP_PLATFORM := android-21" >> jni/Application.mk
@@ -100,7 +100,7 @@ WHOLELIBS = \
 
 $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
 	mkdir -p $(OBJLOCAL)
-	$(CXX) -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz
+	$(CXX) -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz
 
 $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
 	mkdir -p $(SODEST)

android/CustomTarget_lo_android.mk

@@ -8,22 +8,22 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,android/loandroid3))
 
-loandroid3_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LOAndroid3)
+loandroid3_DIR := $(call gb_CustomTarget_get_workdir,android/source)
 
 $(call gb_CustomTarget_get_target,android/loandroid3) : \
 	$(loandroid3_DIR)/done
 
 $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
-	cd $(SRCDIR)/android/experimental/LOAndroid3 && $(MAKE) all
+	cd $(SRCDIR)/android/source && $(MAKE) all
 # Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script
 # still looks for the .apk, and we want fresh daily builds to be uploaded.
 # Us "foo" instead of the old INPATH
 	mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \
-	cp $(SRCDIR)/android/experimental/LOAndroid3/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin
+	cp $(SRCDIR)/android/source/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin
 
 $(call gb_CustomTarget_get_clean_target,android/loandroid3) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
-	cd $(SRCDIR)/android/experimental/LOAndroid3 && $(MAKE) clean
+	cd $(SRCDIR)/android/source && $(MAKE) clean
 
 # vim: set noet sw=4 ts=4:

android/source/Makefile

@@ -12,7 +12,7 @@ all: build-ant
 APP_PACKAGE=org.libreoffice
 
 DISABLE_UI=TRUE
-BOOTSTRAPDIR=../../Bootstrap
+BOOTSTRAPDIR=../Bootstrap
 include $(BOOTSTRAPDIR)/Makefile.shared
 
 native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py

android/source/project.properties

@@ -11,5 +11,5 @@
 target=android-21
 
 # Use the Bootstrap class
-android.library.reference.1=../../Bootstrap
-android.library.reference.2=../../AppCompat-v7
+android.library.reference.1=../Bootstrap
+android.library.reference.2=../AppCompat-v7