| Index: content/shell/android/BUILD.gn
|
| diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
|
| index 68b2232bc206188f005fc1ecbbcfa52d6205bf53..d42635f0c75221712c7c6cf6f9886b09d53cf785 100644
|
| --- a/content/shell/android/BUILD.gn
|
| +++ b/content/shell/android/BUILD.gn
|
| @@ -15,6 +15,12 @@ generate_jni("content_shell_jni_headers") {
|
| "java/src/org/chromium/content_shell/ShellManager.java",
|
| "java/src/org/chromium/content_shell/ShellMojoTestUtils.java",
|
| ]
|
| +
|
| + if (use_aura) {
|
| + sources -= [
|
| + "java/src/org/chromium/content_shell/ShellManager.java",
|
| + ]
|
| + }
|
| }
|
|
|
| shared_library("libcontent_shell_content_view") {
|
| @@ -26,12 +32,14 @@ shared_library("libcontent_shell_content_view") {
|
| "//components/crash/browser",
|
| "//skia",
|
| "//media/base/android",
|
| + "//ui/platform_window/android",
|
| ]
|
| sources = [
|
| "shell_library_loader.cc",
|
| ]
|
| }
|
|
|
| +# TODO(mfomitchev): we don't need shell_view.xml for Aura
|
| android_resources("content_shell_java_resources") {
|
| testonly = true
|
| resource_dirs = [ "java/res" ]
|
| @@ -49,7 +57,18 @@ android_library("content_shell_java") {
|
| "//ui/android:ui_java",
|
| ":content_shell_java_resources",
|
| ]
|
| - DEPRECATED_java_in_dir = "java/src"
|
| + java_files = [
|
| + "java/src/org/chromium/content_shell/Shell.java",
|
| + "java/src/org/chromium/content_shell/ShellLayoutTestUtils.java",
|
| + "java/src/org/chromium/content_shell/ShellManager.java",
|
| + "java/src/org/chromium/content_shell/ShellMojoTestUtils.java",
|
| + ]
|
| +
|
| + if (use_aura) {
|
| + java_files -= [
|
| + "java/src/org/chromium/content_shell/ShellManager.java",
|
| + ]
|
| + }
|
| }
|
|
|
| content_shell_manifest =
|
| @@ -57,13 +76,21 @@ content_shell_manifest =
|
|
|
| jinja_template("content_shell_manifest") {
|
| testonly = true
|
| - input = "shell_apk/AndroidManifest.xml.jinja2"
|
| + if (use_aura) {
|
| + input = "aura_shell_apk/AndroidManifest.xml.jinja2"
|
| + } else {
|
| + input = "shell_apk/AndroidManifest.xml.jinja2"
|
| + }
|
| output = content_shell_manifest
|
| }
|
|
|
| android_resources("content_shell_apk_resources") {
|
| testonly = true
|
| - resource_dirs = [ "shell_apk/res" ]
|
| + if (use_aura) {
|
| + resource_dirs = [ "aura_shell_apk/res" ]
|
| + } else {
|
| + resource_dirs = [ "shell_apk/res" ]
|
| + }
|
| deps = [
|
| ":content_shell_java_resources",
|
| ":content_shell_manifest",
|
| @@ -81,8 +108,14 @@ android_library("content_shell_apk_java") {
|
| "//media/base/android:media_java",
|
| "//net/android:net_java",
|
| "//ui/android:ui_java",
|
| + "//ui/platform_window/android:platform_window_java",
|
| ]
|
| - DEPRECATED_java_in_dir = "shell_apk/src"
|
| +
|
| + if (use_aura) {
|
| + DEPRECATED_java_in_dir = "aura_shell_apk/src"
|
| + } else {
|
| + DEPRECATED_java_in_dir = "shell_apk/src"
|
| + }
|
| }
|
|
|
| content_shell_assets_dir = "$root_build_dir/content_shell/assets"
|
|
|