Commit 5b0fc0fb authored by Tibor Goldschwendt's avatar Tibor Goldschwendt Committed by Commit Bot

[ar] Pass bundle module name via variable and set it to "ArPublicModule"

This is required so that the public and internal AR module can have
different names.

Bug: 863063
Change-Id: If0151c862efa2074f00868519c7f68d39836c538
Reviewed-on: https://chromium-review.googlesource.com/1178882Reviewed-by: default avataragrieve <agrieve@chromium.org>
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584079}
parent 65ae5b21
...@@ -1715,6 +1715,7 @@ if (defined(expected_static_initializer_count)) { ...@@ -1715,6 +1715,7 @@ if (defined(expected_static_initializer_count)) {
if (enable_arcore) { if (enable_arcore) {
ar_module_tmpl("ar_public_module") { ar_module_tmpl("ar_public_module") {
manifest_package = manifest_package manifest_package = manifest_package
module_name = "ArPublicModule"
} }
} }
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<!-- TODO(crbug.com/863068): Set dist:onDemand="true" once we can on-demand <!-- TODO(crbug.com/863068): Set dist:onDemand="true" once we can on-demand
install modules. --> install modules. -->
<!-- TODO(crbug.com/871912: Use @string reference for dist:title. --> <!-- TODO(crbug.com/871912): Use @string reference for dist:title. -->
<dist:module <dist:module
dist:onDemand="false" dist:onDemand="false"
dist:title="AR"> dist:title="AR">
......
...@@ -8,9 +8,10 @@ import("//device/vr/buildflags/buildflags.gni") ...@@ -8,9 +8,10 @@ import("//device/vr/buildflags/buildflags.gni")
assert(enable_arcore) assert(enable_arcore)
template("ar_module_tmpl") { template("ar_module_tmpl") {
_manifest = "$target_gen_dir/AndroidManifest.xml"
assert(defined(invoker.manifest_package)) assert(defined(invoker.manifest_package))
assert(defined(invoker.module_name))
_manifest = "$target_gen_dir/$target_name/AndroidManifest.xml"
_manifest_target = "${target_name}__manifest" _manifest_target = "${target_name}__manifest"
jinja_template(_manifest_target) { jinja_template(_manifest_target) {
input = "//chrome/android/modules/ar/AndroidManifest.xml" input = "//chrome/android/modules/ar/AndroidManifest.xml"
...@@ -22,7 +23,7 @@ template("ar_module_tmpl") { ...@@ -22,7 +23,7 @@ template("ar_module_tmpl") {
} }
android_app_bundle_module(target_name) { android_app_bundle_module(target_name) {
module_name = "ArModule" module_name = invoker.module_name
android_manifest = _manifest android_manifest = _manifest
android_manifest_dep = ":$_manifest_target" android_manifest_dep = ":$_manifest_target"
deps = [ deps = [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment