SQLite Android Bindings
Check-in [3f19250fc5]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix logging macros.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3f19250fc5cb4439567e8c99304a82df7c48c9c8
User & Date: dan 2013-12-19 18:42:10
Context
2013-12-20
17:02
Start setting up some infrastructure code for a test suite. Add a test demonstrating the problem with type Cursor. check-in: 69b389af43 user: dan tags: trunk
2013-12-19
18:42
Fix logging macros. check-in: 3f19250fc5 user: dan tags: trunk
17:58
Copy extra header files from android core into this project. The C++ part now builds with just the NDK - no android source tree required. check-in: d9b8fd9674 user: dan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to jni/android_database_SQLiteConnection.cpp.

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
 * limitations under the License.
 */

#define LOG_TAG "SQLiteConnection"

#include <jni.h>
#include <JNIHelp.h>

#define ALOG(...)
#define ALOGV(...)
#define ALOGE(...)
#define ALOGW(...)


#if 0
#include <utils/Log.h>
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/Log.h>

#include <utils/String8.h>
#include <utils/String16.h>

#include <cutils/ashmem.h>
#endif

#include <sys/mman.h>

#include <string.h>
#include <unistd.h>

#if 0
#include <androidfw/CursorWindow.h>
#endif








<
<
<
<
<
<
<
<
|
<
<

<
<

<
<
<

<







14
15
16
17
18
19
20








21


22


23



24

25
26
27
28
29
30
31
 * limitations under the License.
 */

#define LOG_TAG "SQLiteConnection"

#include <jni.h>
#include <JNIHelp.h>








#include "ALog-priv.h"









#include <sys/mman.h>

#include <string.h>
#include <unistd.h>

#if 0
#include <androidfw/CursorWindow.h>
#endif

Changes to jni/android_database_SQLiteDebug.cpp.

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
 * limitations under the License.
 */

#define LOG_TAG "SQLiteDebug"

#include <jni.h>
#include <JNIHelp.h>

#define LOG_FATAL_IF(...)

#if 0
#include <android_runtime/AndroidRuntime.h>
#include <utils/Log.h>
#endif

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

#include <sqlite3.h>







|
|
|
|
|
|
|







14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
 * limitations under the License.
 */

#define LOG_TAG "SQLiteDebug"

#include <jni.h>
#include <JNIHelp.h>
#include <ALog-priv.h>

/*
** Not quite the same as the core android LOG_FATAL_IF (which also
** sends a SIGTRAP), but close enough.
*/
#define LOG_FATAL_IF(bCond, zErr) if( bCond ) ALOGE(zErr);

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

#include <sqlite3.h>

Changes to jni/android_database_SQLiteGlobal.cpp.

14
15
16
17
18
19
20

21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
 * limitations under the License.
 */

#define LOG_TAG "SQLiteGlobal"

#include <jni.h>
#include <JNIHelp.h>


#define ALOGV(...)
#define ALOG(...)

#if 0
#include <android_runtime/AndroidRuntime.h>
#include "android_util_Log.h"
#endif

#include <sqlite3.h>
#if 0
#include <sqlite3_android.h>
#endif









>

<
<
<
<
<
<
<







14
15
16
17
18
19
20
21
22







23
24
25
26
27
28
29
 * limitations under the License.
 */

#define LOG_TAG "SQLiteGlobal"

#include <jni.h>
#include <JNIHelp.h>
#include "ALog-priv.h"









#include <sqlite3.h>
#if 0
#include <sqlite3_android.h>
#endif