Skip to content
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.

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

hardening fixes with regards to the liblog headers on Android #28

Closed
wants to merge 2 commits into from
Closed

hardening fixes with regards to the liblog headers on Android #28

wants to merge 2 commits into from

Conversation

salyzyn
Copy link
Contributor

@salyzyn salyzyn commented Jan 10, 2017

Two hardening fixes with regards to the liblog headers on Android. One to use log/log.h for bundled applications, the other to not create build errors, and to use the supplied set, should android/log.h contain the logging macros.

Add ifdefs surrounding the compatibility set here.

Test: compile
Bug: 30465923
Change-Id: I1a7401ce87b5ede66a67b0ec11de925193281efa
Partial reverse of course regarding export of macros into the ndk.
We still deprecate cutils/log.h, but we use log/log.h, not
android/log.h for the macros.

adjust history on commit 60dc8f0.

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I523854afa0635396b0ee90051f9db6c0af3b5ea6
@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please let us know the company's name.

@salyzyn
Copy link
Contributor Author

salyzyn commented Jan 10, 2017

I signed it as an individual contributor.

@googlebot
Copy link

CLAs look good, thanks!

@salyzyn
Copy link
Contributor Author

salyzyn commented Jan 13, 2017

Notes:

fix in common/src/jni/main/cpp/org_conscrupt_NativeCrypto.cpp needs to move to common/src/jni.main/include/macros.h
fix in common/src/jni/unbuncled/include/log_compat.h needs to move to move to common/src/jni.main/include/macros.h

Web UI is not suitable for this migration/refactoring, will need to formulate a new pull request :-(

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants