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

Unified Diff: chrome/BUILD.gn

Issue 570203002: Make chrome_shell_apk build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-chrome-jamesr
Patch Set: Rebase add chrome_version_java/page_connection_info_javagen Created 6 years, 2 months 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 | « build/config/android/rules.gni ('k') | chrome/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 4bf0a5d60f5ea8f4d32550860900b2d7bb4022e8..f57535907ccbb8581bb96a26e522dcd95f01c1fe 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -8,6 +8,10 @@ import("//build/config/ui.gni")
import("//chrome/chrome_repack_locales.gni")
import("//chrome/version.gni")
+if (is_android) {
+ import("//build/config/android/rules.gni")
+}
+
if (!is_android) {
# TODO(GYP) for Windows need to the the reorder-imports step which probably
@@ -322,7 +326,7 @@ group("packed_resources") {
}
repack("packed_extra_resources") {
- visibility = [ ":*" ]
+ visibility = [ "./*" ]
sources = [
"$root_gen_dir/chrome/browser_resources.pak",
"$root_gen_dir/chrome/chrome_unscaled_resources.pak",
@@ -522,3 +526,48 @@ group("strings") {
"//chrome/app/resources:locale_settings",
]
}
+
+if (is_android) {
+
+# GYP: //chrome/chrome.gyp:page_info_connection_type_java
+java_cpp_enum("page_info_connection_type_javagen") {
+ sources = [
+ "browser/ui/android/website_settings_popup_android.h"
+ ]
+ outputs = [
+ "org/chromium/chrome/browser/PageInfoConnectionType.java",
+ ]
+}
+
+# GYP: //chrome/chrome_android.gypi:chrome_android_core
+static_library("chrome_android_core") {
+ sources = [
+ "app/android/chrome_android_initializer.cc",
+ "app/android/chrome_android_initializer.h",
+ "app/android/chrome_main_delegate_android.cc",
+ "app/android/chrome_main_delegate_android.h",
+ "app/chrome_main_delegate.cc",
+ "app/chrome_main_delegate.h",
+ ]
+
+ include_dirs = [
+ android_ndk_include_dir,
+ ]
+
+ libs = [
+ "android",
+ "jnigraphics",
+ ]
+
+ deps = [
+ "//chrome/browser",
+ "//chrome/browser/ui",
+ "//chrome/plugin",
+ "//chrome/renderer",
+ "//chrome/utility",
+ "//components/enhanced_bookmarks",
+ "//content/public/app:browser",
+ ]
+}
+
+}
« no previous file with comments | « build/config/android/rules.gni ('k') | chrome/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698