Add data files for base and net. Move GN Python proto outputs.

third_party/protobuf/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 if (is_win) {
   config_h_dir = "vsprojects"
 } else {
   config_h_dir = "."
 }
 
@@ skipping 247 matching lines @@
 
     cflags = protobuf_lite_cflags
 
     deps = [
       ":protobuf_full",
     ]
     deps += [ "//build/config/sanitizers:deps" ]
   }
 }
 
+google_python_dir = "$root_out_dir/pyproto/google"
+
 copy("copy_google") {
   sources = [
     "__init__.py",
   ]
   outputs = [
-    "$root_gen_dir/google/{{source_file_part}}",
+    "$google_python_dir/{{source_file_part}}",
   ]
 }
 
 copy("copy_google_protobuf") {
   sources = [
     "python/google/protobuf/__init__.py",
     "python/google/protobuf/descriptor.py",
     "python/google/protobuf/descriptor_database.py",
     "python/google/protobuf/descriptor_pool.py",
     "python/google/protobuf/message.py",
     "python/google/protobuf/message_factory.py",
     "python/google/protobuf/reflection.py",
     "python/google/protobuf/service.py",
     "python/google/protobuf/service_reflection.py",
     "python/google/protobuf/text_format.py",
 
     # TODO(ncarter): protoc"s python generator treats
     # descriptor.proto specially, but it's not possible to trigger
     # the special treatment unless you run protoc from ./src/src
     # (the treatment is based on the path to the .proto file
     # matching a constant exactly). I'm not sure how to convince
     # gyp to execute a rule from a different directory.  Until this
     # is resolved, use a copy of descriptor_pb2.py that I manually
     # generated.
     "descriptor_pb2.py",
   ]
   outputs = [
-    "$root_gen_dir/google/protobuf/{{source_file_part}}",
+    "$google_python_dir/protobuf/{{source_file_part}}",
   ]
 }
 
 copy("copy_google_protobuf_internal") {
   sources = [
     "python/google/protobuf/internal/__init__.py",
     "python/google/protobuf/internal/api_implementation.py",
     "python/google/protobuf/internal/containers.py",
     "python/google/protobuf/internal/cpp_message.py",
     "python/google/protobuf/internal/decoder.py",
     "python/google/protobuf/internal/encoder.py",
     "python/google/protobuf/internal/enum_type_wrapper.py",
     "python/google/protobuf/internal/generator_test.py",
     "python/google/protobuf/internal/message_listener.py",
     "python/google/protobuf/internal/python_message.py",
     "python/google/protobuf/internal/type_checkers.py",
     "python/google/protobuf/internal/wire_format.py",
   ]
   outputs = [
-    "$root_gen_dir/google/protobuf/internal/{{source_file_part}}",
+    "$google_python_dir/protobuf/internal/{{source_file_part}}",
   ]
 }
 
 group("py_proto") {
   public_deps = [
     ":copy_google",
     ":copy_google_protobuf",
     ":copy_google_protobuf_internal",
   ]
+
+  # Targets that depend on this should depend on the copied data files.
+  data = get_target_outputs(":copy_google")
+  data += get_target_outputs(":copy_google_protobuf")
+  data += get_target_outputs(":copy_google_protobuf_internal")
 }