Google Git
Sign in
webrtc / src / / 9fe11010f7fb74266d84a59698fb34ecefee5d08
commit9fe11010f7fb74266d84a59698fb34ecefee5d08[log] [tgz]
authorbrettw@chromium.org <brettw@chromium.org>Tue Sep 09 19:15:33 2014
committerbrettw@chromium.org <brettw@chromium.org>Tue Sep 09 19:15:33 2014
tree3b7137181496ac6627cde9efc78c120ba31f9c4d
parent54cf1505e254f9e2b58b459ee4f32865696beacb [diff]
Fix the RTC+Chromium GN build.

LOGGING_INSIDE_WEBRTC was being set in the inherited config, whereas in the GYP build this define is not inherited. This caused duplicate logging macros to be defined in Chrome files dependening on WebRTC targets.

Move LOGGING_INSIDE_WEBRTC to the common config (non-inherited).

TBR=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/25449004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7122 4adac7df-926f-26a2-2b94-8c16560cd09d
1 file changed
tree: 3b7137181496ac6627cde9efc78c120ba31f9c4d
  1. chromium/
  2. data/
  3. resources/
  4. talk/
  5. third_party/
  6. tools/
  7. webrtc/
  8. .clang-format
  9. .gitignore
  10. all.gyp
  11. android-webrtc.mk
  12. AUTHORS
  13. BUILD.gn
  14. codereview.settings
  15. COPYING
  16. DEPS
  17. drover.properties
  18. libvpx.mk
  19. LICENSE
  20. license_template.txt
  21. LICENSE_THIRD_PARTY
  22. OWNERS
  23. PATENTS
  24. PRESUBMIT.py
  25. setup_links.py
  26. sync_chromium.py
  27. WATCHLISTS