diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-09-05 17:40:56 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-09-07 22:03:10 +0200 |
| commit | 2e8e0b213a3cbac802515cd9255286b26d3bba60 (patch) | |
| tree | ab2604f78186fa3308e85cfbc8f0a2c406140cfb /android/Bootstrap | |
| parent | fix nss build for android x86 and remove duplicated configure call (diff) | |
| download | core-2e8e0b213a3cbac802515cd9255286b26d3bba60.tar.gz core-2e8e0b213a3cbac802515cd9255286b26d3bba60.zip | |
android: drop workarounds for ndk-gdb support (can still run manually)
packing gdbserver into apk conflicts with extractNativeLibs="false", as
the gradle pugin compresses it (which could be disabled using
aaptOptions), but furthermore it doesn't page-align it, breaking
installation.
So instead let the user manually push the gdbserver tool to device and
remove the hardcoded values that were only there to please the ndk-gdb
scripts.
Using lldb from within Android Studio is more comfortable anyway :-)
Change-Id: I31c3af4847a479c56b3fcd6b5bed114e004bf0d2
Reviewed-on: https://gerrit.libreoffice.org/41950
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'android/Bootstrap')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index e06e36cdac54..332192918e9c 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -99,8 +99,6 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk && echo " liboVersionMajor = '$(LIBO_VERSION_MAJOR)'" \ && echo " liboVersionMinor = '$(LIBO_VERSION_MINOR)'" \ && echo " liboGitFullCommit = '$(shell cd $(SRCDIR) && git log -1 --format=%H)'" \ - && echo " liboNdkGdbserver = '$(ANDROID_NDK_GDBSERVER)'" \ - && echo " liboAndroidAppAbi = '$(ANDROID_APP_ABI)'" \ && echo "}" \ && echo "android.defaultConfig {" \ && echo " applicationId '$(ANDROID_PACKAGE_NAME)'" \ |