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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: blimp/client/app/BUILD.gn

Issue 2387813002: Move session into //blimp/client/app and update GN files. (Closed)
Patch Set: Rebased Created 4 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 | « blimp/client/BUILD.gn ('k') | blimp/client/app/android/blimp_client_session_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/app/BUILD.gn
diff --git a/blimp/client/BUILD.gn b/blimp/client/app/BUILD.gn
similarity index 66%
copy from blimp/client/BUILD.gn
copy to blimp/client/app/BUILD.gn
index 652d5559d5ccc1ecc2a60f2abecc28071eed2bb8..5e200eda80c19cf38a78f9767ee6a39db4de8ce1 100644
--- a/blimp/client/BUILD.gn
+++ b/blimp/client/app/BUILD.gn
@@ -9,45 +9,19 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
-source_set("session") {
- sources = [
- "session/blimp_client_session.cc",
- "session/blimp_client_session.h",
- ]
-
- public_deps = [
- "//blimp/client/core",
- "//blimp/client/core/geolocation",
- "//blimp/client/core/switches",
- "//blimp/common/proto",
- "//device/geolocation",
- "//ui/events",
- ]
-
- deps = [
- "//base",
- "//blimp/client/core/compositor",
- "//blimp/client/core/contents",
- "//blimp/client/core/render_widget",
- "//blimp/client/core/session",
- "//blimp/client/core/settings",
- "//blimp/common",
- "//blimp/common/proto",
- "//blimp/net",
- "//net",
- "//ui/gfx/geometry",
- "//url:url",
+source_set("app") {
+ visibility = [
+ ":*",
+ "//blimp/client:*",
]
-}
-source_set("client") {
sources = [
- "app/blimp_discardable_memory_allocator.cc",
- "app/blimp_discardable_memory_allocator.h",
- "app/blimp_startup.cc",
- "app/blimp_startup.h",
- "app/compositor/browser_compositor.cc",
- "app/compositor/browser_compositor.h",
+ "blimp_discardable_memory_allocator.cc",
+ "blimp_discardable_memory_allocator.h",
+ "blimp_startup.cc",
+ "blimp_startup.h",
+ "compositor/browser_compositor.cc",
+ "compositor/browser_compositor.h",
]
public_deps = [
@@ -84,15 +58,53 @@ source_set("client") {
]
}
+source_set("session") {
+ visibility = [
+ ":*",
+ "//blimp/engine:browser_tests",
+ ]
+
+ sources = [
+ "session/blimp_client_session.cc",
+ "session/blimp_client_session.h",
+ ]
+
+ public_deps = [
+ "//blimp/client/core/context",
+ "//blimp/client/core/geolocation",
+ "//blimp/client/core/switches",
+ "//blimp/common/proto",
+ "//device/geolocation",
+ "//ui/events",
+ ]
+
+ deps = [
+ "//base",
+ "//blimp/client/core/compositor",
+ "//blimp/client/core/contents",
+ "//blimp/client/core/render_widget",
+ "//blimp/client/core/session",
+ "//blimp/client/core/settings",
+ "//blimp/common",
+ "//blimp/common/proto",
+ "//blimp/net",
+ "//net",
+ "//ui/gfx/geometry",
+ "//url:url",
+ ]
+}
+
source_set("app_unit_tests") {
+ visibility = [ "//blimp/client:unit_tests" ]
+
testonly = true
sources = [
- "app/blimp_discardable_memory_allocator_unittest.cc",
+ "blimp_discardable_memory_allocator_unittest.cc",
]
deps = [
- ":client",
+ ":app",
"//base",
"//base/test:test_support",
"//testing/gmock",
@@ -117,17 +129,17 @@ source_set("test_support") {
if (is_linux && !is_chromeos && use_x11) {
executable("blimp_shell") {
sources = [
- "app/linux/blimp_client_context_delegate_linux.cc",
- "app/linux/blimp_client_context_delegate_linux.h",
- "app/linux/blimp_display_manager.cc",
- "app/linux/blimp_display_manager.h",
- "app/linux/blimp_display_manager_delegate_main.cc",
- "app/linux/blimp_display_manager_delegate_main.h",
- "app/linux/blimp_main.cc",
+ "linux/blimp_client_context_delegate_linux.cc",
+ "linux/blimp_client_context_delegate_linux.h",
+ "linux/blimp_display_manager.cc",
+ "linux/blimp_display_manager.h",
+ "linux/blimp_display_manager_delegate_main.cc",
+ "linux/blimp_display_manager_delegate_main.h",
+ "linux/blimp_main.cc",
]
deps = [
- ":client",
+ ":app",
"//base",
"//blimp/client/core/compositor",
"//blimp/client/core/session",
@@ -165,31 +177,42 @@ if (is_android) {
jinja_variables = [ "manifest_package=$manifest_package" ]
jinja_template("blimp_apk_manifest") {
- input = "app/android/AndroidManifest.xml.jinja2"
+ visibility = [ ":*" ]
+
+ input = "android/AndroidManifest.xml.jinja2"
output = blimp_apk_manifest
variables = jinja_variables
}
jinja_template("blimp_test_apk_manifest") {
- input = "app/android/javatests/AndroidManifest.xml.jinja2"
+ visibility = [ ":*" ]
+
+ input = "android/javatests/AndroidManifest.xml.jinja2"
output = blimp_test_apk_manifest
variables = jinja_variables
}
generate_jni("jni_headers") {
+ visibility = [ ":*" ]
+
sources = [
- "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
- "app/android/java/src/org/chromium/blimp/BlimpView.java",
- "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
- "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java",
- "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
+ "android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
+ "android/java/src/org/chromium/blimp/BlimpView.java",
+ "android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
+ "android/java/src/org/chromium/blimp/session/TabControlFeature.java",
+ "android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
]
jni_package = "blimp"
}
android_resources("blimp_java_resources") {
- resource_dirs = [ "app/android/java/res" ]
+ visibility = [
+ ":*",
+ "//blimp/client/core/contents/*", # TODO(xingliu): Remove this.
+ "//blimp/client/core/settings/*", # TODO(xingliu): Remove this.
+ ]
+ resource_dirs = [ "android/java/res" ]
deps = [
":blimp_strings_grd",
]
@@ -197,7 +220,7 @@ if (is_android) {
}
java_strings_grd("blimp_strings_grd") {
- grd_file = "app/android/java/strings/android_blimp_strings.grd"
+ grd_file = "android/java/strings/android_blimp_strings.grd"
outputs = [
"values-am/android_blimp_strings.xml",
"values-ar/android_blimp_strings.xml",
@@ -247,6 +270,8 @@ if (is_android) {
}
android_library("blimp_java") {
+ visibility = [ ":*" ]
+
deps = [
":blimp_java_resources",
"//base:base_java",
@@ -261,27 +286,29 @@ if (is_android) {
]
java_files = [
- "app/android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java",
- "app/android/java/src/org/chromium/blimp/auth/TokenSource.java",
- "app/android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java",
- "app/android/java/src/org/chromium/blimp/BlimpApplication.java",
- "app/android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
- "app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java",
- "app/android/java/src/org/chromium/blimp/BlimpView.java",
- "app/android/java/src/org/chromium/blimp/BrowserRestartActivity.java",
- "app/android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java",
- "app/android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
- "app/android/java/src/org/chromium/blimp/session/EngineInfo.java",
- "app/android/java/src/org/chromium/blimp/session/TabControlFeature.java",
- "app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.java",
- "app/android/java/src/org/chromium/blimp/settings/Preferences.java",
- "app/android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
- "app/android/java/src/org/chromium/blimp/toolbar/ToolbarMenu.java",
- "app/android/java/src/org/chromium/blimp/toolbar/UrlBar.java",
+ "android/java/src/org/chromium/blimp/auth/RetryingTokenSource.java",
+ "android/java/src/org/chromium/blimp/auth/TokenSource.java",
+ "android/java/src/org/chromium/blimp/auth/TokenSourceImpl.java",
+ "android/java/src/org/chromium/blimp/BlimpApplication.java",
+ "android/java/src/org/chromium/blimp/BlimpLibraryLoader.java",
+ "android/java/src/org/chromium/blimp/BlimpRendererActivity.java",
+ "android/java/src/org/chromium/blimp/BlimpView.java",
+ "android/java/src/org/chromium/blimp/BrowserRestartActivity.java",
+ "android/java/src/org/chromium/blimp/preferences/PreferencesUtil.java",
+ "android/java/src/org/chromium/blimp/session/BlimpClientSession.java",
+ "android/java/src/org/chromium/blimp/session/EngineInfo.java",
+ "android/java/src/org/chromium/blimp/session/TabControlFeature.java",
+ "android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.java",
+ "android/java/src/org/chromium/blimp/settings/Preferences.java",
+ "android/java/src/org/chromium/blimp/toolbar/Toolbar.java",
+ "android/java/src/org/chromium/blimp/toolbar/ToolbarMenu.java",
+ "android/java/src/org/chromium/blimp/toolbar/UrlBar.java",
]
}
android_library("blimp_test_java") {
+ visibility = [ ":*" ]
+
testonly = true
deps = [
@@ -300,19 +327,19 @@ if (is_android) {
]
java_files = [
- "app/android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java",
- "app/android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest.java",
- "app/android/javatests/src/org/chromium/blimp/core/MockBlimpClientContext.java",
- "app/android/javatests/src/org/chromium/blimp/core/MockBlimpClientContextDelegate.java",
- "app/android/javatests/src/org/chromium/blimp/core/settings/BlimpPreferencesTest.java",
- "app/android/javatests/src/org/chromium/blimp/core/settings/MockPreferences.java",
- "app/android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java",
+ "android/javatests/src/org/chromium/blimp/auth/MockTokenSource.java",
+ "android/javatests/src/org/chromium/blimp/auth/RetryingTokenSourceTest.java",
+ "android/javatests/src/org/chromium/blimp/core/MockBlimpClientContext.java",
+ "android/javatests/src/org/chromium/blimp/core/MockBlimpClientContextDelegate.java",
+ "android/javatests/src/org/chromium/blimp/core/settings/BlimpPreferencesTest.java",
+ "android/javatests/src/org/chromium/blimp/core/settings/MockPreferences.java",
+ "android/javatests/src/org/chromium/blimp/BlimpNativeInstrumentationTestCase.java",
]
}
- shared_library("blimp_client_android") {
+ shared_library("blimp_app_android") {
deps = [
- ":client",
+ ":app",
":jni_headers",
"//base",
"//blimp/client/core",
@@ -334,20 +361,20 @@ if (is_android) {
]
sources = [
- "app/android/blimp_app_jni_registrar.cc",
- "app/android/blimp_app_jni_registrar.h",
- "app/android/blimp_client_session_android.cc",
- "app/android/blimp_client_session_android.h",
- "app/android/blimp_library_loader.cc",
- "app/android/blimp_library_loader.h",
- "app/android/blimp_view.cc",
- "app/android/blimp_view.h",
- "app/android/tab_control_feature_android.cc",
- "app/android/tab_control_feature_android.h",
- "app/android/toolbar.cc",
- "app/android/toolbar.h",
- "app/user_agent.cc",
- "app/user_agent.h",
+ "android/blimp_app_jni_registrar.cc",
+ "android/blimp_app_jni_registrar.h",
+ "android/blimp_client_session_android.cc",
+ "android/blimp_client_session_android.h",
+ "android/blimp_library_loader.cc",
+ "android/blimp_library_loader.h",
+ "android/blimp_view.cc",
+ "android/blimp_view.h",
+ "android/tab_control_feature_android.cc",
+ "android/tab_control_feature_android.h",
+ "android/toolbar.cc",
+ "android/toolbar.h",
+ "user_agent.cc",
+ "user_agent.h",
]
libs = [ "android" ]
@@ -364,7 +391,7 @@ if (is_android) {
apk_name = "Blimp"
android_manifest = blimp_apk_manifest
android_manifest_dep = ":blimp_apk_manifest"
- shared_libraries = [ ":blimp_client_android" ]
+ shared_libraries = [ ":blimp_app_android" ]
}
instrumentation_test_apk("blimp_test_apk") {
« no previous file with comments | « blimp/client/BUILD.gn ('k') | blimp/client/app/android/blimp_client_session_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698