Move //mojo/{public, edk} underneath //third_party

android_webview/java_library_common.mk

 # 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.
 
 LOCAL_SDK_VERSION := 21
 
 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
 
 # contentview and its dependencies
 LOCAL_AIDL_INCLUDES := \
     $(LOCAL_PATH)/../content/public/android/java/src \
     $(LOCAL_PATH)/../net/android/java/src \
     $(LOCAL_PATH)/../third_party/eyesfree/src/android/java/src
 
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, ../content/public/android/java/src) \
     ../content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl \
     ../content/public/android/java/src/org/chromium/content/common/IChildProcessService.aidl \
     ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl \
     ../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl \
     $(call all-java-files-under, ../base/android/java/src) \
     $(call all-java-files-under, ../device/battery/android/java/src) \
     $(call all-java-files-under, ../media/base/android/java/src) \
     $(call all-java-files-under, ../mojo/android/system/src) \
-    $(call all-java-files-under, ../mojo/public/java/bindings/src) \
-    $(call all-java-files-under, ../mojo/public/java/system/src) \
+    $(call all-java-files-under, ../third_party/mojo/src/mojo/public/java/bindings/src) \
+    $(call all-java-files-under, ../third_party/mojo/src/mojo/public/java/system/src) \
     $(call all-java-files-under, ../net/android/java/src) \
     $(call all-java-files-under, ../ui/android/java/src) \
     $(call all-java-files-under, ../third_party/eyesfree/src/android/java/src) \
     $(call all-Iaidl-files-under, ../third_party/eyesfree/src/android/java/src)
 
 # browser components
 LOCAL_SRC_FILES += \
     $(call all-java-files-under, \
         ../components/web_contents_delegate_android/android/java/src) \
     $(call all-java-files-under, \
@@ skipping 41 matching lines @@
 $(call intermediates-dir-for,GYP,shared)/enums/web_text_input_type/org/chromium/blink_public/web/WebTextInputFlags.java \
 $(call intermediates-dir-for,GYP,shared)/templates/net_errors_java/org/chromium/net/NetError.java \
 $(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/src/org/chromium/mojom/device/BatteryMonitor.java \
 $(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/src/org/chromium/mojom/device/BatteryMonitor_Internal.java \
 $(call intermediates-dir-for,GYP,shared)/java_mojo/device_battery_mojo_bindings/src/org/chromium/mojom/device/BatteryStatus.java \
 
 # content dependencies on java components that are provided by the system on
 # android
 LOCAL_STATIC_JAVA_LIBRARIES += jsr305 guava