Commit 7be925ae authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

build: move Android.mk to packages/Android/

parent 611ec0a1

Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ winbuild/MakefileBuild.vc winbuild/Makefile.vc 


EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in	\

 RELEASE-NOTES buildconf libcurl.pc.in vc6curl.dsw MacOSX-Framework	\

 Android.mk $(CMAKE_DIST) Makefile.msvc.names $(WINBUILD_DIST)		\

 lib/libcurl.vers.in

 $(CMAKE_DIST) Makefile.msvc.names $(WINBUILD_DIST) lib/libcurl.vers.in



bin_SCRIPTS = curl-config

docs/INSTALL

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ VxWorks 
Android

=======

   Method using the static makefile:

      - see the build notes in the Android.mk file.

      - see the build notes in the packages/Android/Android.mk file.



   Method using a configure cross-compile (tested with Android NDK r7c, r8):

      - prepare the toolchain of the Android NDK for standalone use; this can

Android.mk→packages/Android/Android.mk

+0 −0

File moved.

View file

packages/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ EXTRA_DIST = README \ 
	Symbian/readme.txt 		\

	TPF/curl.mak 			\

	TPF/maketpf.env_curl 		\

	TPF/maketpf.env_curllib

	TPF/maketpf.env_curllib         \

	Android/Android.mk