Merge "Skip replay inline comments for revisions that do not exist in source" into stable-2.11
diff --git a/BUCK b/BUCK
index 8f9d440..d118181 100644
--- a/BUCK
+++ b/BUCK
@@ -4,12 +4,8 @@
 
 if STANDALONE_MODE:
   HTTP_LIB = '//lib/http:http_lib'
-  GSON = '//lib/gson:gson'
-  LOG4J = '//lib/log:log4j'
 else:
   HTTP_LIB = '//plugins/importer/lib/http:http_lib'
-  GSON = '//plugins/importer/lib/gson:gson'
-  LOG4J = '//plugins/importer/lib/log:log4j'
 
 gerrit_plugin(
   name = 'importer',
@@ -28,8 +24,8 @@
     HTTP_LIB,
   ],
   provided_deps = [
-    LOG4J,
-    GSON,
+    '//lib:gson',
+    '//lib/log:log4j',
   ],
 )
 
diff --git a/lib/gson/BUCK b/lib/BUCK
similarity index 100%
rename from lib/gson/BUCK
rename to lib/BUCK