Commit 8ce0d79601ba22239cea2baa8150072f8da4c22d
1 parent
325c9fc2
Exists in
master
and in
5 other branches
Gerando lib3270.so "light" para android
Showing
4 changed files
with
16 additions
and
11 deletions
Show diff stats
src/android/Makefile
| ... | ... | @@ -30,6 +30,10 @@ CLASSPATH=br/com/bb/pw3270 |
| 30 | 30 | Debug: jni/lib3270jni.h |
| 31 | 31 | @$(NDKBUILD) |
| 32 | 32 | |
| 33 | +clean: | |
| 34 | + @rm -fr obj | |
| 35 | + @rm -f jni/lib3270jni.h | |
| 36 | + | |
| 33 | 37 | jni/lib3270jni.h: bin/classes/$(CLASSPATH)/lib3270.class |
| 34 | 38 | @$(JAVAH) -o $@ -classpath bin/classes $(subst /,.,$(CLASSPATH)).lib3270 |
| 35 | 39 | ... | ... |
src/android/jni/Android.mk
| ... | ... | @@ -27,9 +27,7 @@ LOCAL_PATH := $(call my-dir) |
| 27 | 27 | |
| 28 | 28 | include $(CLEAR_VARS) |
| 29 | 29 | |
| 30 | -# include ../lib3270/sources.mak | |
| 31 | -TERMINAL_SOURCES= bounds.c XtGlue.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \ | |
| 32 | - host.c sf.c ansi.c log.c resolver.c xio.c tables.c proxy.c utf8.c charset.c | |
| 30 | +include ../lib3270/sources.mak | |
| 33 | 31 | |
| 34 | 32 | LOCAL_CFLAGS=-I../include |
| 35 | 33 | LOCAL_MODULE := lib3270 | ... | ... |
src/lib3270/proxy.c
| ... | ... | @@ -548,9 +548,13 @@ proxy_socks4(int fd, char *host, unsigned short port, int force_a) |
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | /* Resolve the username. */ |
| 551 | +#ifdef ANDROID | |
| 552 | + user = "android"; | |
| 553 | +#else | |
| 551 | 554 | user = getenv("USER"); |
| 552 | 555 | if (user == CN) |
| 553 | 556 | user = "nobody"; |
| 557 | +#endif | |
| 554 | 558 | |
| 555 | 559 | /* Send the request to the server. */ |
| 556 | 560 | if (use_4a) { | ... | ... |
src/lib3270/sources.mak
| ... | ... | @@ -22,14 +22,13 @@ |
| 22 | 22 | # |
| 23 | 23 | # perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) |
| 24 | 24 | # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) |
| 25 | -# licinio@bb.com.br (Licínio Luis Branco) | |
| 26 | -# kraucer@bb.com.br (Kraucer Fernandes Mazuco) | |
| 27 | 25 | # |
| 28 | 26 | |
| 29 | -SOURCES = XtGlue.c init.c actions.c ansi.c charset.c ctlr.c \ | |
| 30 | - ft.c ft_cut.c ft_dft.c glue.c host.c kybd.c \ | |
| 31 | - proxy.c resources.c rpq.c screen.c see.c \ | |
| 32 | - sf.c tables.c telnet.c toggles.c trace_ds.c utf8.c util.c \ | |
| 33 | - xio.c resolver.c log.c paste.c macros.c fallbacks.c version.c \ | |
| 34 | - selection.c bounds.c | |
| 27 | +# Terminal only sources | |
| 28 | +TERMINAL_SOURCES = bounds.c XtGlue.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \ | |
| 29 | + host.c sf.c ansi.c log.c resolver.c xio.c tables.c proxy.c utf8.c charset.c | |
| 30 | + | |
| 31 | +# Full library sources | |
| 32 | +SOURCES = $(TERMINAL_SOURCES) init.c actions.c ft.c ft_cut.c ft_dft.c glue.c resources.c \ | |
| 33 | + rpq.c see.c trace_ds.c paste.c macros.c fallbacks.c version.c | |
| 35 | 34 | ... | ... |