Ivan Vladimirovich Kuznetsov
26173fcdad
There is no reason to use a custom project structure. The usual Android project structure makes the development of new features easier using a modular approach. Therefore, the logic of gradle files was divided into different levels, gradle scripts was migrated to kotlin, dependency definitions was moved into toml file. No one java or kotlin file has been changed. These changes based on: 1) Android build structure: https://developer.android.com/build/android-build-structure 2) Migrate your build to version catalogs: https://developer.android.com/build/migrate-to-catalogs 3) Migrate your build configuration from Groovy to Kotlin https://developer.android.com/build/migrate-to-kotlin-dsl Note: The source module has not been renamed to app (this is the usual name for a top-level application subproject), because I currently do not know what other changes will need to be made besides gradle scripts (maybe in the Makefiles or in other) for a correct build. Additional analysis required. Change-Id: Ic11efdb51524e795b8c6e2605b6501d9699c525c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195939 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
111 lines
4.8 KiB
Makefile
111 lines
4.8 KiB
Makefile
#
|
|
# Common Makefile pieces for building Java / Android apps.
|
|
#
|
|
|
|
#
|
|
# BOOTSTRAPDIR needs to be set to this directory before starting this
|
|
#
|
|
|
|
# Probably would be best to just stop fooling around with the possibilities to
|
|
# set various stuff with the -env command line parameters (and environment
|
|
# variables?) and in a plethora of rc files, and hardcode construction of
|
|
# *all* required pathnames based on the app installation location for Android
|
|
# (and iOS), etc. We don't really win anything by having so many layers of
|
|
# configurability on platforms like Android and iOS where apps based on LO
|
|
# code are very much self-contained pre-packaged thingies.
|
|
|
|
JNILIBSDIR=$(BUILDDIR)/android/jniLibs
|
|
SODEST=$(JNILIBSDIR)/$(ANDROID_APP_ABI)
|
|
OBJLOCAL=$(BUILDDIR)/android/obj/local/$(ANDROID_APP_ABI)
|
|
|
|
#
|
|
# Build / link the single .so for this app
|
|
#
|
|
|
|
ALL_STATIC_LIBS := $(shell $(SRCDIR)/bin/lo-all-static-libs)
|
|
|
|
LIBS = \
|
|
-Wl,--start-group \
|
|
$(ALL_STATIC_LIBS) \
|
|
-Wl,--end-group
|
|
|
|
NSSLIBS = freebl3 \
|
|
nspr4 \
|
|
nss3 \
|
|
nssckbi \
|
|
nssdbm3 \
|
|
nssutil3 \
|
|
plc4 \
|
|
plds4 \
|
|
smime3 \
|
|
softokn3 \
|
|
sqlite3 \
|
|
ssl3 \
|
|
|
|
WHOLELIBS = \
|
|
-Wl,--whole-archive \
|
|
$(addprefix -l,$(strip \
|
|
$(if $(ENABLE_JAVA),juh) \
|
|
)) \
|
|
-Wl,--no-whole-archive
|
|
|
|
|
|
$(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
|
|
@echo "Linking $@"
|
|
mkdir -p $(OBJLOCAL)
|
|
$(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
|
|
|
|
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
|
|
mkdir -p $(SODEST)
|
|
$(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so
|
|
#to keep some symbols, eg.: $(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so -w -K 'Java*'
|
|
|
|
$(SODEST)/nss-libraries :
|
|
mkdir -p $(SODEST)
|
|
$(foreach lib,$(NSSLIBS),$(STRIP) -o $(SODEST)/lib$(lib).so $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib$(lib).so;)
|
|
|
|
$(SODEST)/libc++_shared.so : $(ANDROID_TOOLCHAIN)/sysroot/usr/lib/$(ANDROID_SYSROOT_PLATFORM)/libc++_shared.so
|
|
mkdir -p $(SODEST)
|
|
cp $< $@
|
|
|
|
link-so: $(SODEST)/liblo-native-code.so $(SODEST)/nss-libraries $(SODEST)/libc++_shared.so
|
|
|
|
# If you reinstall an app several times *on the emulator*, even if you
|
|
# uninstall it between, disk space seems to leak that won't get recycled until
|
|
# you stop and start... No idea if this holds for a device, too. (And you
|
|
# can't "stop" a device anyway.)
|
|
|
|
stop-start-cycle:
|
|
$(ANDROID_SDK_DIR)/platform-tools/adb shell stop && $(ANDROID_SDK_DIR)/platform-tools/adb shell start && sleep 10
|
|
|
|
# build-host specific stuff (build paths and the like) to keep build.gradle static
|
|
liboSettings.gradle.kts: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk \
|
|
$(wildcard $(INSTDIR)/program/version.ini $(INSTDIR)/program/versionrc) \
|
|
$(SRCDIR)/android/Bootstrap/Makefile.shared
|
|
@echo "creating $@"
|
|
( \
|
|
echo "// created by Makefile.shared - your changes will be overridden" \
|
|
&& echo "extra.apply {" \
|
|
&& echo " set(\"liboSrcRoot\", \"$(SRC_ROOT)\")" \
|
|
&& echo " set(\"liboJniLibsdir\", \"$(JNILIBSDIR)\")" \
|
|
&& echo " set(\"liboWorkdir\", \"$(WORKDIR)\")" \
|
|
&& echo " set(\"liboInstdir\", \"$(INSTDIR)\")" \
|
|
&& echo " set(\"liboEtcFolder\", \"$(LIBO_ETC_FOLDER)\")" \
|
|
&& echo " set(\"liboUreMiscFolder\", \"$(LIBO_URE_MISC_FOLDER)\")" \
|
|
&& echo " set(\"liboSharedResFolder\", \"$(LIBO_SHARE_RESOURCE_FOLDER)\")" \
|
|
&& echo " set(\"liboUREJavaFolder\", \"$(LIBO_URE_SHARE_JAVA_FOLDER)\")" \
|
|
&& echo " set(\"liboShareJavaFolder\", \"$(LIBO_SHARE_JAVA_FOLDER)\")" \
|
|
&& echo " set(\"liboVersionMajor\", \"$(LIBO_VERSION_MAJOR)\")" \
|
|
&& echo " set(\"liboVersionMinor\", \"$(LIBO_VERSION_MINOR)\")" \
|
|
&& echo " set(\"liboGitFullCommit\", \"$(shell cd $(SRCDIR) && git log -1 --format=%H)\")" \
|
|
&& echo " set(\"androidNdkPath\", \"$(ANDROID_NDK_DIR)\")" \
|
|
&& echo " set(\"androidNdkVersion\", \"$(ANDROID_NDK_VERSION)\")" \
|
|
&& echo " set(\"androidApplicationId\", \"$(ANDROID_PACKAGE_NAME)\")" \
|
|
&& echo " set(\"androidMinSdkVersion\", $(ANDROID_API_LEVEL))" \
|
|
&& echo " set(\"androidVersionName\", \"$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)\")" \
|
|
&& echo " set(\"buildIdShort\", \"\\\"$(shell cd $(SRCDIR) && git log -1 --format=%h)\\\"\")" \
|
|
&& echo " set(\"vendor\", \"\\\"$(OOO_VENDOR)\\\"\")" \
|
|
&& echo " set(\"privacyPolicyUrl\", \"\\\"$(PRIVACY_POLICY_URL)\\\"\")" \
|
|
&& echo "}" \
|
|
) > $@
|