Move third_party/mojo/src/mojo/public to mojo/public

mojo/public/mojo_sdk.gni

 # 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.
 
-# The absolute path to the directory containing the mojo public SDK (i.e., the
-# directory containing mojo/public). The build files within the Mojo public
-# SDK use this variable to allow themselves to be parameterized by the location
-# of the public SDK within a client repo.
-mojo_root = get_path_info("../..", "abspath")
-
 # Takes as input a "source_set" that includes dependencies that are relative to
 # the parent directory of the Mojo public SDK (given in |mojo_sdk_deps|).
 # Generates a source_set that has the mojo_sdk_deps added as ordinary deps
 # rebased to the current directory.
 # By default, restricts the entries that are given in invoker.deps and
 # invoker.public_deps to be only within the same file and on a small set of
 # whitelisted external dependencies. This check can be elided by setting
 # restrict_external_deps to false in the invoker. DO NOT DO THIS in
 # //mojo/public.
 #
@@ skipping 21 matching lines @@
 #   ]
 # }
 #
 template("mojo_sdk_source_set") {
   source_set(target_name) {
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     } else {
       visibility = [ "*" ]
     }
-    if (defined(invoker.mojo_sdk_visibility)) {
-      foreach(sdk_target, invoker.mojo_sdk_visibility) {
-        # Check that the SDK target was not mistakenly given as an absolute
+    if (defined(invoker.mojo_edk_visibility)) {
+      foreach(edk_target, invoker.mojo_edk_visibility) {
+        # Check that the EDK target was not mistakenly given as an absolute
         # path.
-        assert(get_path_info(sdk_target, "abspath") != sdk_target)
-        visibility += [ rebase_path(sdk_target, ".", mojo_root) ]
+        assert(get_path_info(edk_target, "abspath") != edk_target)
+        visibility += [ rebase_path(edk_target, ".", "//third_party/mojo/src") ]
       }
     }
 
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
 
     if (defined(invoker.sources)) {
       sources = invoker.sources
     }
@@ skipping 31 matching lines @@
       foreach(dep, invoker.public_deps) {
         if (restrict_external_deps) {
           # The only deps that are not specified relative to the location of
           # the Mojo SDK should be on targets within the same file or on a
           # whitelisted set of external dependencies.
           assert(get_path_info(dep, "dir") == ".")
         }
         public_deps += [ dep ]
       }
     }
+    if (defined(invoker.mojo_edk_public_deps)) {
+      foreach(edk_dep, invoker.mojo_edk_public_deps) {
+        # Check that the EDK dep was not mistakenly given as an absolute path.
+        assert(get_path_info(edk_dep, "abspath") != edk_dep)
+        public_deps += [ rebase_path(edk_dep, ".", "//third_party/mojo/src") ]
+      }
+    }
     if (defined(invoker.mojo_sdk_public_deps)) {
       foreach(sdk_dep, invoker.mojo_sdk_public_deps) {
         # Check that the SDK dep was not mistakenly given as an absolute path.
         assert(get_path_info(sdk_dep, "abspath") != sdk_dep)
-        public_deps += [ rebase_path(sdk_dep, ".", mojo_root) ]
+        public_deps += [ rebase_path(sdk_dep, ".", "//") ]
       }
     }
 
     deps = []
     if (defined(invoker.deps)) {
       foreach(dep, invoker.deps) {
         if (restrict_external_deps) {
           # The only deps that are not specified relative to the location of
           # the Mojo SDK should be on targets within the same file or on a
           # whitelisted set of external dependencies.
           dep_dir = get_path_info(dep, "dir")
           assert(dep_dir == "." || dep == "//testing/gtest" ||
                  dep == "//mojo/environment:chromium" ||
                  dep == "//mojo/message_pump")
         }
         deps += [ dep ]
       }
     }
+    if (defined(invoker.mojo_edk_deps)) {
+      foreach(edk_dep, invoker.mojo_edk_deps) {
+        # Check that the EDK dep was not mistakenly given as an absolute path.
+        assert(get_path_info(edk_dep, "abspath") != edk_dep)
+        deps += [ rebase_path(edk_dep, ".", "//third_party/mojo/src") ]
+      }
+    }
     if (defined(invoker.mojo_sdk_deps)) {
       foreach(sdk_dep, invoker.mojo_sdk_deps) {
         # Check that the SDK dep was not mistakenly given as an absolute path.
         assert(get_path_info(sdk_dep, "abspath") != sdk_dep)
-        deps += [ rebase_path(sdk_dep, ".", mojo_root) ]
+        deps += [ rebase_path(sdk_dep, ".", "//") ]
       }
     }
 
     data_deps = []
     if (defined(invoker.data_deps)) {
       data_deps = invoker.data_deps
     }
   }
 }