Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup properties

Browse source
This commit is contained in:
Victor Shcherb 2018-07-26 01:01:45 +02:00
parent 46d060ef74
commit fececbcf02
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/jni/Android.mk
View file

@ -2,19 +2,16 @@ LOCAL_PATH := $(call my-dir)
ROOT_PATH := $(LOCAL_PATH)/../../.. ROOT_PATH := $(LOCAL_PATH)/../../..
$(info OsmAnd root: $(ROOT_PATH)) $(info OsmAnd root: $(ROOT_PATH))
# LEGACY {
ifdef BUILD_ONLY_OLD_LIB ifdef BUILD_ONLY_OLD_LIB
OSMAND_MAKEFILES := \ OSMAND_MAKEFILES := \
$(all-subdir-makefiles) \ $(all-subdir-makefiles) \
$(call all-makefiles-under,$(ROOT_PATH)/core-legacy/targets/android) $(call all-makefiles-under,$(ROOT_PATH)/core-legacy/targets/android)
else else
# } LEGACY
OSMAND_MAKEFILES := \ OSMAND_MAKEFILES := \
$(all-subdir-makefiles) \ $(all-subdir-makefiles) \
$(call all-makefiles-under,$(ROOT_PATH)/core/wrappers/android) $(call all-makefiles-under,$(ROOT_PATH)/core/wrappers/android)
# LEGACY {
endif endif
# } LEGACY
$(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) $(info OsmAnd makefiles: $(OSMAND_MAKEFILES))
# By default, include makefiles only once # By default, include makefiles only once

2
gradle.properties
View file

@ -13,7 +13,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
#Fri Apr 08 18:47:31 EEST 2016 #Fri Apr 08 18:47:31 EEST 2016
android.useDeprecatedNdk=true # android.useDeprecatedNdk=true
# for enableD8=true min sdk must be > 22 # for enableD8=true min sdk must be > 22
# UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed # UPDATE: temporairly commented since gradle plugin updated to 3.1.3 and claims INSTALL_FAILED_DEXOPT is fixed