commit ae0faaf033869e28c88076fef6470eb6d7e2bd4c
author tfarina <tfarina@chromium.org> Sat Dec 19 05:55:25 2015 -0800
committer Commit bot <commit-bot@chromium.org> Sat Dec 19 13:56:35 2015 +0000
tree 0cac9849cbc962f8f53d3984b290d1ced3867e7d
parent 6cfbc2e48e7cba7c6451752c69dc71ff25ad68b5

move libevent into base

This simplifies the process of bootstrapping gn standalone.

And libevent is not really used outside of base. base is actually its only client.

BUG=569352
TEST=See CL for details for how to reproduce this.
R=thestig@chromium.org
TBR=cpu@chromium.org

Review URL: https://codereview.chromium.org/1531573008

Cr-Original-Commit-Position: refs/heads/master@{#366282}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c7ebe6daa79da2e351345065020cc7f216126f15

tools/gn/bootstrap/bootstrap.py

diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
index 38003e3..cd72fe7 100755
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -310,19 +310,19 @@
     ])
     static_libraries['libevent'] = {
         'sources': [
-            'third_party/libevent/buffer.c',
-            'third_party/libevent/evbuffer.c',
-            'third_party/libevent/evdns.c',
-            'third_party/libevent/event.c',
-            'third_party/libevent/event_tagging.c',
-            'third_party/libevent/evrpc.c',
-            'third_party/libevent/evutil.c',
-            'third_party/libevent/http.c',
-            'third_party/libevent/log.c',
-            'third_party/libevent/poll.c',
-            'third_party/libevent/select.c',
-            'third_party/libevent/signal.c',
-            'third_party/libevent/strlcpy.c',
+            'base/third_party/libevent/buffer.c',
+            'base/third_party/libevent/evbuffer.c',
+            'base/third_party/libevent/evdns.c',
+            'base/third_party/libevent/event.c',
+            'base/third_party/libevent/event_tagging.c',
+            'base/third_party/libevent/evrpc.c',
+            'base/third_party/libevent/evutil.c',
+            'base/third_party/libevent/http.c',
+            'base/third_party/libevent/log.c',
+            'base/third_party/libevent/poll.c',
+            'base/third_party/libevent/select.c',
+            'base/third_party/libevent/signal.c',
+            'base/third_party/libevent/strlcpy.c',
         ],
         'tool': 'cc',
         'include_dirs': [],
@@ -354,10 +354,10 @@
         'base/trace_event/process_memory_maps_dump_provider.cc',
     ])
     static_libraries['libevent']['include_dirs'].extend([
-        os.path.join(SRC_ROOT, 'third_party', 'libevent', 'linux')
+        os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')
     ])
     static_libraries['libevent']['sources'].extend([
-        'third_party/libevent/epoll.c',
+        'base/third_party/libevent/epoll.c',
     ])
 
 
@@ -382,10 +382,10 @@
         'base/trace_event/malloc_dump_provider.cc',
     ])
     static_libraries['libevent']['include_dirs'].extend([
-        os.path.join(SRC_ROOT, 'third_party', 'libevent', 'mac')
+        os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'mac')
     ])
     static_libraries['libevent']['sources'].extend([
-        'third_party/libevent/kqueue.c',
+        'base/third_party/libevent/kqueue.c',
     ])