Michael Weghorn
ac43e55493
That build variant whose build could be triggered
e.g. by running
./gradlew assembleFullUIRelease
from `android/source` would fail to build for
a long time already, like this:
/home/michi/development/git/libreoffice-WORKTREE-android/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java:189: error: cannot find symbol
final boolean bEditingEnabled = BuildConfig.ALLOW_EDITING && preferences.getBoolean(LibreOfficeMainActivity.ENABLE_EXPERIMENTAL_PREFS_KEY, false);
^
symbol: variable ALLOW_EDITING
location: class BuildConfig
In addition, it would be the default variant
used by Android Studio, so in order to get
a working build, it was always necessary to
explicitly switch to another variant first
(using "Build" -> "Select build variant").
Drop it altogether, since it's unused.
(It would include all of the .ui files
in the APK while the other build variants
explicitly specify what files to include.)
Change-Id: I0a6096ec69897eb57f41c512e88a4c1a848480ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187623
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
41 lines
1.6 KiB
Makefile
41 lines
1.6 KiB
Makefile
ifeq ($(BUILDDIR),)
|
|
gb_Side:=host
|
|
include ../../config_host.mk
|
|
endif
|
|
|
|
# The default target builds the APK and runs lint.
|
|
|
|
all: build-gradle
|
|
|
|
DISABLE_UI=TRUE
|
|
BUILD_VARIANT=$(if $(DISABLE_UI),StrippedUI)$(if $(ENABLE_ANDROID_EDITING),Editing)$(if $(ENABLE_RELEASE_BUILD),Release,Debug)
|
|
BOOTSTRAPDIR=../Bootstrap
|
|
include $(BOOTSTRAPDIR)/Makefile.shared
|
|
|
|
native-code.cxx: $(SRCDIR)/solenv/bin/native-code.py
|
|
@echo "[build PY ] $@"
|
|
$< -j -g core -g writer -g calc -g draw -g edit > $@
|
|
|
|
install:
|
|
if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) install$(if $(DISABLE_UI),StrippedUI)$(if $(ENABLE_ANDROID_EDITING),Editing)Debug ; fi
|
|
@if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then echo ; echo 'Run it with "make run"' ; echo ; fi
|
|
|
|
uninstall:
|
|
$(ANDROID_SDK_DIR)/platform-tools/adb uninstall $(ANDROID_PACKAGE_NAME)
|
|
|
|
clean:
|
|
rm -rf assets assets_strippedUI build jniLibs jniLibs_debug res_generated $(OBJLOCAL)
|
|
rm -f native-code.cxx
|
|
rm -f liboSettings.gradle
|
|
|
|
build-gradle: liboSettings.gradle local.properties link-so
|
|
ifeq ($(ENABLE_JAVA),TRUE)
|
|
if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then ./gradlew $(if $(verbose),--info) $(if $(versionCode),-PcmdVersionCode=$(versionCode)) assemble$(BUILD_VARIANT) lint$(BUILD_VARIANT) ; fi
|
|
endif
|
|
|
|
run:
|
|
if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then $(ANDROID_SDK_DIR)/platform-tools/adb shell am start -n $(ANDROID_PACKAGE_NAME)/org.libreoffice.ui.LibreOfficeUIActivity ; fi
|
|
|
|
debugrun:
|
|
@echo "please debug with lldb from within Android Studio, or setup ndk-gdb manually (see android/README for details)"
|