SQLite Android Bindings
Check-in [49c7a766e1]
Not logged in

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

Overview
Comment:Merge documentation updates with this branch.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | api-level-15
Files: files | file ages | folders
SHA1: 49c7a766e146e40a7fcd1d0791dd131afe243051
User & Date: dan 2014-05-21 18:17:12
Context
2014-06-11
19:10
Merge trunk with this branch. check-in: 7fbe992d8f user: dan tags: api-level-15
2014-05-21
18:17
Merge documentation updates with this branch. check-in: 49c7a766e1 user: dan tags: api-level-15
17:37
Update index.wiki to mention the "api-level-15" branch. check-in: 3596e35aa8 user: dan tags: trunk
16:54
Add local versions of classes CancellationSignal and OperationCanceledExcecption so that this code will work with API level 15. check-in: 59f9c6ccd7 user: dan tags: api-level-15
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to www/index.wiki.

    18     18   to build a custom version of SQLite to be shipped with the application while
    19     19   still continuing to use the standard Java interface.
    20     20   
    21     21   <h2>Normal Usage</h2>
    22     22   
    23     23   <h3>Installation</h3>
    24     24   
           25  +<p>
           26  +  Android API levels 15 (Android 4.0.3) and greater are supported. If
           27  +  targetting API level 16 or greater, use the default "trunk" branch of this
           28  +  project. Or, for API level 15, use the "api-level-15" branch. It is not possible
           29  +  to target an API level lower than 15.
           30  +
    25     31   <p>
    26     32     Copy the following files from this project into the equivalent locations in
    27     33     the application project.
    28     34   
    29     35   <pre>
    30     36       jni/Android.mk
    31     37       jni/Application.mk
................................................................................
    33     39       src/org/sqlite/database/*          (copy contents of directory recursively)
    34     40   </pre>
    35     41   
    36     42   <p>
    37     43     Following this, the directory structures should contain 
    38     44     [/tree?ci=trunk&re=%5ejni%7csrc/org/sqlite/data&expand | these files].
    39     45   
           46  +<p>
           47  +  For API level 15 only, also copy the following:
           48  +
           49  +<pre>
           50  +    src/org/sqlite/os/*                (copy contents of directory recursively)
           51  +</pre>
           52  +
    40     53   <p>
    41     54     Directory "jni/sqlite/" contains copies of the sqlite3.h and sqlite3.c 
    42     55     source files. Between them, they contain the
    43     56     <a href=http://www.sqlite.org/amalgamation.html>source code for the SQLite
    44     57     library</a>. If necessary, replace these with the source for the specific 
    45     58     version of SQLite required. If SQLite is to be compiled with any special
    46     59     pre-processor macros defined, add them to the "jni/sqlite/Android.mk" file