Move rules for building Android Mojo services to //mojo/android
This CL simplifies the downstream dependencies for building Mojo applications
for Android because they no longer need to pull in //services/android to get
this rules.gni file.
R=etiennej@chromium.org
Review URL: https://codereview.chromium.org/1239353002 .
diff --git a/examples/java_android/echo/BUILD.gn b/examples/java_android/echo/BUILD.gn
index baacbf6..8e50d07 100644
--- a/examples/java_android/echo/BUILD.gn
+++ b/examples/java_android/echo/BUILD.gn
@@ -4,7 +4,7 @@
import("//mojo/public/mojo_application.gni")
import("//mojo/public/tools/bindings/mojom.gni")
-import("//services/android/rules.gni")
+import("//mojo/android/rules.gni")
group("echo") {
deps = [
diff --git a/examples/java_android/example_service/BUILD.gn b/examples/java_android/example_service/BUILD.gn
index b4cdc46..8bd5647 100644
--- a/examples/java_android/example_service/BUILD.gn
+++ b/examples/java_android/example_service/BUILD.gn
@@ -1,4 +1,4 @@
-import("//services/android/rules.gni")
+import("//mojo/android/rules.gni")
group("example_service") {
deps = [
diff --git a/services/android/add_manifest_entry.py b/mojo/android/add_manifest_entry.py
similarity index 100%
rename from services/android/add_manifest_entry.py
rename to mojo/android/add_manifest_entry.py
diff --git a/services/android/rules.gni b/mojo/android/rules.gni
similarity index 94%
rename from services/android/rules.gni
rename to mojo/android/rules.gni
index facf505..c1c0886 100644
--- a/services/android/rules.gni
+++ b/mojo/android/rules.gni
@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
import("//mojo/public/mojo_application.gni")
-servicess_android_path = get_path_info(".", "abspath")
+mojo_android_path = get_path_info(".", "abspath")
template("mojo_android_java_application") {
assert(defined(invoker.mojo_main))
@@ -42,7 +42,7 @@
}
action(android_with_manifest_name) {
- script = "${servicess_android_path}/add_manifest_entry.py"
+ script = "${mojo_android_path}/add_manifest_entry.py"
deps = [
":$android_standalone_name",
diff --git a/services/authentication/BUILD.gn b/services/authentication/BUILD.gn
index 3c96ce4..b6fdfb5 100644
--- a/services/authentication/BUILD.gn
+++ b/services/authentication/BUILD.gn
@@ -5,7 +5,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
if (is_android) {
- import("//services/android/rules.gni")
+ import("//mojo/android/rules.gni")
mojo_android_java_application("authentication") {
sources = [
diff --git a/services/camera_roll/BUILD.gn b/services/camera_roll/BUILD.gn
index f256737..c6839c4 100644
--- a/services/camera_roll/BUILD.gn
+++ b/services/camera_roll/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/android/rules.gni")
+import("//mojo/android/rules.gni")
mojo_android_java_application("camera_roll") {
sources = [
diff --git a/services/device_info/BUILD.gn b/services/device_info/BUILD.gn
index 31912f6..d5daa29 100644
--- a/services/device_info/BUILD.gn
+++ b/services/device_info/BUILD.gn
@@ -3,7 +3,8 @@
# found in the LICENSE file.
if (is_android) {
- import("//services/android/rules.gni")
+ import("//mojo/android/rules.gni")
+
mojo_android_java_application("device_info") {
sources = [
"src/org/chromium/services/device_info/DeviceInfoService.java",
@@ -21,6 +22,7 @@
if (is_linux) {
import("//mojo/public/mojo_application.gni")
+
mojo_native_application("device_info") {
sources = [
"device_info.cc",
diff --git a/services/location/BUILD.gn b/services/location/BUILD.gn
index 6418266..a727065 100644
--- a/services/location/BUILD.gn
+++ b/services/location/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/android/rules.gni")
+import("//mojo/android/rules.gni")
group("location") {
deps = [
diff --git a/services/notifications/BUILD.gn b/services/notifications/BUILD.gn
index 02391a0..e8f4980 100644
--- a/services/notifications/BUILD.gn
+++ b/services/notifications/BUILD.gn
@@ -5,7 +5,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
if (is_android) {
- import("//services/android/rules.gni")
+ import("//mojo/android/rules.gni")
mojo_android_java_application("notifications") {
sources = [
diff --git a/services/sensors/BUILD.gn b/services/sensors/BUILD.gn
index bb48911..dd38556 100644
--- a/services/sensors/BUILD.gn
+++ b/services/sensors/BUILD.gn
@@ -3,8 +3,8 @@
# found in the LICENSE file.
if (is_android) {
- import("//services/android/rules.gni")
import("//build/config/android/config.gni")
+ import("//mojo/android/rules.gni")
mojo_android_java_application("sensors") {
sources = [
diff --git a/services/speech_recognizer/BUILD.gn b/services/speech_recognizer/BUILD.gn
index 6b221de..293b960 100644
--- a/services/speech_recognizer/BUILD.gn
+++ b/services/speech_recognizer/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/android/rules.gni")
+import("//mojo/android/rules.gni")
mojo_android_java_application("speech_recognizer") {
sources = [
