OSDN Git Service

Look for Android.mk in $(APP_PROJECT_PATH)/jni by default.
authorDavid 'Digit' Turner <digit@google.com>
Wed, 29 Jul 2009 17:04:44 +0000 (19:04 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Wed, 29 Jul 2009 17:04:44 +0000 (19:04 +0200)
commiteee1675aa40d9fcaae3765370f5331e4002d8dd6
treefb08bc495428b6970bd23a2706bbfcdd80c8c6eb
parent197a8fea8e9ae0552b0d20fb5ba4562a851c1bca
Look for Android.mk in $(APP_PROJECT_PATH)/jni by default.

This gets rid of the 'sources' directory and allows all sources
of a given Android application to be in the same directory tree
without using a symlink trick.

Note that apps/<name>/Application.mk is still required though.
A later release of the NDK will get rid of it too, but the change
is too drastic for the upcoming release.

The change moves various source files from sources into their
app/<name>/project/jni directory as well.

The whole documentation is updated to reflect the change.
42 files changed:
ndk/README.TXT
ndk/apps/hello-jni/project/jni/Android.mk [moved from ndk/sources/samples/hello-jni/Android.mk with 100% similarity]
ndk/apps/hello-jni/project/jni/hello-jni.c [moved from ndk/sources/samples/hello-jni/hello-jni.c with 100% similarity]
ndk/apps/san-angeles/project/jni/Android.mk [moved from ndk/sources/samples/san-angeles/Android.mk with 100% similarity]
ndk/apps/san-angeles/project/jni/README.txt [moved from ndk/sources/samples/san-angeles/README.txt with 100% similarity]
ndk/apps/san-angeles/project/jni/app-android.c [moved from ndk/sources/samples/san-angeles/app-android.c with 100% similarity]
ndk/apps/san-angeles/project/jni/app-linux.c [moved from ndk/sources/samples/san-angeles/app-linux.c with 100% similarity]
ndk/apps/san-angeles/project/jni/app-win32.c [moved from ndk/sources/samples/san-angeles/app-win32.c with 100% similarity]
ndk/apps/san-angeles/project/jni/app.h [moved from ndk/sources/samples/san-angeles/app.h with 100% similarity]
ndk/apps/san-angeles/project/jni/cams.h [moved from ndk/sources/samples/san-angeles/cams.h with 100% similarity]
ndk/apps/san-angeles/project/jni/demo.c [moved from ndk/sources/samples/san-angeles/demo.c with 100% similarity]
ndk/apps/san-angeles/project/jni/importgl.c [moved from ndk/sources/samples/san-angeles/importgl.c with 100% similarity]
ndk/apps/san-angeles/project/jni/importgl.h [moved from ndk/sources/samples/san-angeles/importgl.h with 100% similarity]
ndk/apps/san-angeles/project/jni/license-BSD.txt [moved from ndk/sources/samples/san-angeles/license-BSD.txt with 100% similarity]
ndk/apps/san-angeles/project/jni/license-LGPL.txt [moved from ndk/sources/samples/san-angeles/license-LGPL.txt with 100% similarity]
ndk/apps/san-angeles/project/jni/license.txt [moved from ndk/sources/samples/san-angeles/license.txt with 100% similarity]
ndk/apps/san-angeles/project/jni/shapes.h [moved from ndk/sources/samples/san-angeles/shapes.h with 100% similarity]
ndk/apps/two-libs/project/jni/Android.mk [moved from ndk/sources/samples/two-libs/Android.mk with 100% similarity]
ndk/apps/two-libs/project/jni/first.c [moved from ndk/sources/samples/two-libs/first.c with 100% similarity]
ndk/apps/two-libs/project/jni/first.h [moved from ndk/sources/samples/two-libs/first.h with 100% similarity]
ndk/apps/two-libs/project/jni/second.c [moved from ndk/sources/samples/two-libs/second.c with 100% similarity]
ndk/apps/unit-tests/Android.mk [moved from ndk/sources/samples/Android.mk with 100% similarity]
ndk/apps/unit-tests/Application.mk
ndk/apps/unit-tests/test-CLEAR_VARS/Android.mk [moved from ndk/sources/tests/test-CLEAR_VARS/Android.mk with 100% similarity]
ndk/apps/unit-tests/test-LOCAL_CFLAGS/Android.mk [moved from ndk/sources/tests/test-LOCAL_CFLAGS/Android.mk with 100% similarity]
ndk/apps/unit-tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-1.c [moved from ndk/sources/tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-1.c with 100% similarity]
ndk/apps/unit-tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-2.cpp [moved from ndk/sources/tests/test-LOCAL_CFLAGS/test-LOCAL_CFLAGS-2.cpp with 100% similarity]
ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/Android.mk [moved from ndk/sources/tests/test-LOCAL_CPPFLAGS/Android.mk with 100% similarity]
ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-1.c [moved from ndk/sources/tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-1.c with 100% similarity]
ndk/apps/unit-tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-2.cpp [moved from ndk/sources/tests/test-LOCAL_CPPFLAGS/test-LOCAL_CPPFLAGS-2.cpp with 100% similarity]
ndk/build/core/add-application.mk
ndk/build/core/definitions.mk
ndk/build/core/main.mk
ndk/build/core/setup-toolchain.mk
ndk/docs/ANDROID-MK.TXT
ndk/docs/APPLICATION-MK.TXT
ndk/docs/CHANGES.TXT
ndk/docs/HOWTO.TXT
ndk/docs/INSTALL.TXT
ndk/docs/OVERVIEW.TXT
ndk/docs/SYSTEM-ISSUES.TXT
ndk/sources/tests/Android.mk [deleted file]