From 258865df089dccbe1919166b8123f7d27543f9f2 Mon Sep 17 00:00:00 2001 From: Phil Krylov Date: Tue, 26 Mar 2019 11:40:19 +0300 Subject: [PATCH] Revert "Error to build harbour for Android" --- ChangeLog.txt | 5 ----- config/android/libs.mk | 1 - contrib/hbpost.hbm | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 3500df4651..83cd7f84cd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,11 +7,6 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ -2019-03-26 01:55 UTC-0300 Lailton Fernando Mariano (lailton/at/harbour.com.br) - * config/android/libs.mk - * contrib/hbpost.hbm - ! fixed compiler error for Android. added lib log - 2019-03-19 18:12 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * config/win/global.mk * utils/hbmk2/hbmk2.prg diff --git a/config/android/libs.mk b/config/android/libs.mk index 831a5bb492..135f361464 100644 --- a/config/android/libs.mk +++ b/config/android/libs.mk @@ -1,4 +1,3 @@ include $(TOP)$(ROOT)config/linux/libs.mk SYSLIBS := $(filter-out rt pthread, $(SYSLIBS)) -SYSLIBS += log diff --git a/contrib/hbpost.hbm b/contrib/hbpost.hbm index be21526285..0e5d0641be 100644 --- a/contrib/hbpost.hbm +++ b/contrib/hbpost.hbm @@ -35,7 +35,7 @@ {hbdyn&unix&!darwin&!android&!cygwin}-ln=${hb_dynprefix}${hb_outputname}${hb_dynext}.${hb_major}.${hb_minor} {hbdyn&unix&darwin}-ln=${hb_dynprefix}${hb_outputname}.${hb_major}.${hb_minor}${hb_dynext} {hbdyn&android}-lharbour -{hbdyn&android}-lm -llog +{hbdyn&android}-lm {hbdyn&(allwin|cygwin)}-lhbmaindllp {hbdyn}-depimplib-