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

Side by Side Diff: mandoline/app/android/BUILD.gn

Issue 1236543004: GN (android): Append ".cr" to component .so's to avoid zygote lib collisions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn16
Patch Set: android_shared_library_extension -> android_product_extension (to match GYP) Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « components/resource_provider/BUILD.gn ('k') | mandoline/services/updater/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 assert(is_android) 5 assert(is_android)
6 6
7 import("//build/config/android/config.gni") 7 import("//build/config/android/config.gni")
8 import("//build/config/android/rules.gni") 8 import("//build/config/android/rules.gni")
9 import("//mojo/generate_mojo_shell_assets_list.gni") 9 import("//mojo/generate_mojo_shell_assets_list.gni")
10 10
(...skipping 26 matching lines...) Expand all
37 } 37 }
38 38
39 copy("copy_mandoline_runner") { 39 copy("copy_mandoline_runner") {
40 deps = [ 40 deps = [
41 ":mandoline_runner", 41 ":mandoline_runner",
42 ] 42 ]
43 sources = [ 43 sources = [
44 "$root_out_dir/exe.stripped/mandoline_runner", 44 "$root_out_dir/exe.stripped/mandoline_runner",
45 ] 45 ]
46 outputs = [ 46 outputs = [
47 "$root_out_dir/lib.stripped/libmandoline_runner.so", 47 "$root_out_dir/lib.stripped/libmandoline_runner$android_product_extension",
48 ] 48 ]
49 } 49 }
50 50
51 copy_ex("copy_mandoline_assets") { 51 copy_ex("copy_mandoline_assets") {
52 clear_dir = true 52 clear_dir = true
53 dest = mandoline_assets_dir 53 dest = mandoline_assets_dir
54 deps = [ 54 deps = [
55 "//components/devtools_service", 55 "//components/devtools_service",
56 "//components/html_viewer", 56 "//components/html_viewer",
57 "//mandoline/services/core_services", 57 "//mandoline/services/core_services",
58 "//mojo/services/network", 58 "//mojo/services/network",
59 "//components/resource_provider", 59 "//components/resource_provider",
60 "//mojo/runner:bootstrap", 60 "//mojo/runner:bootstrap",
61 "//mojo/runner:bootstrap_java", 61 "//mojo/runner:bootstrap_java",
62 ] 62 ]
63 sources = [ 63 sources = [
64 "$root_out_dir/lib.stripped/libbootstrap.so", 64 "$root_out_dir/lib.stripped/libbootstrap$android_product_extension",
65 "$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar", 65 "$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar",
66 ] 66 ]
67 67
68 # Directories can't be specified as sources so pass manually to the script. 68 # Directories can't be specified as sources so pass manually to the script.
69 args = [ 69 args = [
70 "--files=" + rebase_path("$root_out_dir/core_services", root_build_dir), 70 "--files=" + rebase_path("$root_out_dir/core_services", root_build_dir),
71 "--files=" + rebase_path("$root_out_dir/network_service", root_build_dir), 71 "--files=" + rebase_path("$root_out_dir/network_service", root_build_dir),
72 "--files=" + rebase_path("$root_out_dir/resource_provider", root_build_dir), 72 "--files=" + rebase_path("$root_out_dir/resource_provider", root_build_dir),
73 "--files=" + rebase_path("$root_out_dir/devtools_service", root_build_dir), 73 "--files=" + rebase_path("$root_out_dir/devtools_service", root_build_dir),
74 "--files=" + rebase_path("$root_out_dir/html_viewer", root_build_dir), 74 "--files=" + rebase_path("$root_out_dir/html_viewer", root_build_dir),
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 android_resources("mandoline_apk_resources") { 113 android_resources("mandoline_apk_resources") {
114 custom_package = "org.chromium.mandoline" 114 custom_package = "org.chromium.mandoline"
115 resource_dirs = [ "apk/res" ] 115 resource_dirs = [ "apk/res" ]
116 } 116 }
117 117
118 android_apk("mandoline_apk") { 118 android_apk("mandoline_apk") {
119 apk_name = "Mandoline" 119 apk_name = "Mandoline"
120 120
121 android_manifest = "apk/AndroidManifest.xml" 121 android_manifest = "apk/AndroidManifest.xml"
122 122
123 native_libs = [ "libmandoline_runner.so" ] 123 native_libs = [ "libmandoline_runner$android_product_extension" ]
124 124
125 asset_location = mandoline_assets_dir 125 asset_location = mandoline_assets_dir
126 126
127 deps = [ 127 deps = [
128 ":build_mandoline_assets", 128 ":build_mandoline_assets",
129 ":copy_mandoline_runner", 129 ":copy_mandoline_runner",
130 ":java", 130 ":java",
131 ":mandoline_apk_resources", 131 ":mandoline_apk_resources",
132 "//mojo/runner:java", 132 "//mojo/runner:java",
133 "//mojo/runner:resources", 133 "//mojo/runner:resources",
134 "//base:base_java", 134 "//base:base_java",
135 "//third_party/android_tools:google_play_services_default_resources", 135 "//third_party/android_tools:google_play_services_default_resources",
136 "//ui/platform_window/android:platform_window_java", 136 "//ui/platform_window/android:platform_window_java",
137 ] 137 ]
138 } 138 }
OLDNEW
« no previous file with comments | « components/resource_provider/BUILD.gn ('k') | mandoline/services/updater/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698