Revert JNI_JARJAR_PREFIX change #43
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The C preprocessor was inserting "JNI_JARJAR_PREFIX" as the prefix for the objects instead of the intended value "com.android" Revert this part of the change for now.
nmittler
reviewed
Jan 13, 2017
| #ifndef CONSCRYPT_NOT_UNBUNDLED | ||
| #define CONSCRYPT_UNBUNDLED | ||
| #endif | ||
| #define JNI_JARJAR_PREFIX |
There was a problem hiding this comment.
FYI, this causes a warning on windows IIRC
There was a problem hiding this comment.
Windows currently has a sea of warnings. I can change this to "" though.
There was a problem hiding this comment.
IIRC, "" doesn't work either ... I forget why exactly. I had tried a few things here ... it's a bit tricky.
There was a problem hiding this comment.
Okay, I'll leave it at a warning :)
nmittler
approved these changes
Jan 13, 2017
nmittler
approved these changes
Jan 13, 2017
kruton
force-pushed
the
jni-prefix-partial-revert
branch
from
23c87da
to
ae278b4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The C preprocessor was inserting "JNI_JARJAR_PREFIX" as the prefix for
the objects instead of the intended value "com.android" Revert this
part of the change for now.