Skip to content

Project Update #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 20 commits into from
Oct 29, 2011
Merged

Project Update #19

merged 20 commits into from
Oct 29, 2011

Conversation

developernotes
Copy link
Member

Hello,

The attached pull request makes a handful of changes to the android-database-sqlcipher project. They include the following:

  • Makefile for automating the build process
  • Updated README which includes development instructions
  • Cross process cursor support fixed
  • Statically linked icu4c project directly into libsqlcipher_android.so
  • Various build file modifications

Please let me know if you have any questions. Thanks!

Nick Parker

@eighthave
Copy link
Collaborator

These commits seem to be interleaved timewise with Nathan's commits in the guardianproject/android-database-sqlcipher repo. I wouldn't want things to get messed up when they get applied in a different order, since I don't think we want to rewrite the history of the main repo. Would it be possible for you to rebase these patches so they all apply on top of the HEAD of the master branch on guardianproject/android-database-sqlcipher? I do a lot of rebasing if you want a hand with it.

developernotes and others added 20 commits October 28, 2011 08:33
@developernotes
Adding the .DS_Store file to the ignore list
8fe294e
@developernotes
Adding libandroid_runtime.so and libbinder.so to ease linking
884119f
@developernotes
Changing the SQLite build to allow extension loading
38679e8
@developernotes
Adding a build file for ant
95c3059
@developernotes
Build configuration that includes a statically linked version of the …
5be3f35 
…icu project and sqlcipher
@developernotes
Adding updates for the icu project
41668d6
@developernotes
Update gitmodule for the icu project
bf9f016
@developernotes
Initial merge of icu build project into the root external build file
1e3039f
@developernotes
Fix to allow cross process cursors to work with sqlcipher
2796385
@developernotes
Updating icu4c submodule back to correct commit and repository
ed7d5d2
@developernotes
Creating the directories for libcrypto and libssl for install
608f142
@developernotes
Removing user specific files for build system
d4ee12b
@developernotes
Updating the README with build instructions and formatting
c9ad76d
@sjlombardo @developernotes
Revert "refactored code to use android/database/CursorWindow instead …
b234b5c 
…of unnecessary clone into gp namespace"

This reverts commit e914c2c.
@sjlombardo @developernotes
Revert "refactoed to code to use android/database/CursorWindow instea…
a486208 
…d of our own; solves fillWindow, CrossProcessCursor and Observable issues"

This reverts commit 4fc4c3c.

Conflicts:

	src/info/guardianproject/database/sqlcipher/SQLiteDatabase.java
@sjlombardo @developernotes
bring master inline with gp-cursor following reverts
702b730
@sjlombardo @developernotes
remove generated files from version control
878aaff
@sjlombardo @developernotes
add bin/ and gen/ to ignore list
79b1890
@developernotes
Adding Makefile for building project and updating documentation
feade3a
@developernotes
Adjustment to the build instructions
a6f071f
@developernotes
Copy link
Member Author

Hi,

I have updated the pull request so that all of the commits can be applied directly to the tip of the current master. Let me know if you have any questions. Thanks!

Nick Parker

@n8fr8
Copy link
Collaborator

n8fr8 commented Oct 29, 2011

Just pulled down, built it all myself, and tested it on NoteCipher. Looks good to me... time to merge!

n8fr8 added a commit that referenced this pull request Oct 29, 2011
@n8fr8
Merge pull request #19 from developernotes/master
08a2c0b 
Project Update
@n8fr8 n8fr8 merged commit 08a2c0b into sqlcipher:master Oct 29, 2011
@ankitmittal000 ankitmittal000 mentioned this pull request Jan 21, 2013
Closed
@huanting huanting mentioned this pull request Mar 17, 2018
Closed
@aeroxr1 aeroxr1 mentioned this pull request Apr 22, 2020
Closed
@aneeetha aneeetha mentioned this pull request Jul 19, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@developernotes @eighthave @n8fr8 @sjlombardo