Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2682)

Unified Diff: content/shell/android/BUILD.gn

Issue 1469803006: NOT FOR REVIEW: Aura Android: Content Shell compiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_wthandroid
Patch Set: Temp Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/android/aura_shell_apk/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/android/BUILD.gn
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
index 94e0d9f2199fb61f8451a9232c92a39fb842124f..1f1a5e94939c2e76cb851ec98e0dab0bb9d66344 100644
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -9,12 +9,18 @@ import("//third_party/icu/config.gni")
generate_jni("content_shell_jni_headers") {
jni_package = "content/shell"
- sources = [
- "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) {
+ sources = [
+ "java/src/org/chromium/aura_content_shell/Shell.java",
+ ]
+ } else {
+ sources = [
+ "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",
+ ]
+ }
}
shared_library("libcontent_shell_content_view") {
@@ -27,12 +33,14 @@ shared_library("libcontent_shell_content_view") {
"//components/crash/content/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" ]
@@ -50,7 +58,19 @@ android_library("content_shell_java") {
"//ui/android:ui_java",
":content_shell_java_resources",
]
- DEPRECATED_java_in_dir = "java/src"
+
+ if (use_aura) {
+ java_files = [
+ "java/src/org/chromium/aura_content_shell/Shell.java",
+ ]
+ } else {
+ 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",
+ ]
+ }
}
content_shell_manifest =
@@ -58,13 +78,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",
@@ -82,8 +110,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"
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/android/aura_shell_apk/AndroidManifest.xml.jinja2 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698