summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/Bootstrap/Makefile.shared6
1 files changed, 4 insertions, 2 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 74121e6f03b4..f9825b583c05 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -23,8 +23,7 @@ OBJLOCAL=$(BUILDDIR)/android/obj/local/$(ANDROID_APP_ABI)
#
local.properties: $(BUILDDIR)/config_host.mk
- echo ndk.dir=$(ANDROID_NDK_DIR) >local.properties
- echo sdk.dir=$(ANDROID_SDK_DIR) >>local.properties
+ echo sdk.dir=$(ANDROID_SDK_DIR) >local.properties
#
# Build / link the single .so for this app
@@ -106,6 +105,9 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk
&& echo " liboVersionMinor = '$(LIBO_VERSION_MINOR)'" \
&& echo " liboGitFullCommit = '$(shell cd $(SRCDIR) && git log -1 --format=%H)'" \
&& echo "}" \
+ && echo "android {" \
+ && echo " ndkPath '$(ANDROID_NDK_DIR)'" \
+ && echo "}" \
&& echo "android.defaultConfig {" \
&& echo " applicationId '$(ANDROID_PACKAGE_NAME)'" \
&& echo " archivesBaseName = 'LibreOfficeViewer'" \