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

Side by Side Diff: build/config/android/internal_rules.gni

Issue 2416073003: Only list direct deps as java libraries
Patch Set: add c++_shared Created 4 years, 1 month 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
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # Do not add any imports to non-//build directories here. 5 # Do not add any imports to non-//build directories here.
6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
7 import("//build_overrides/build.gni") 7 import("//build_overrides/build.gni")
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/sanitizers/sanitizers.gni") 9 import("//build/config/sanitizers/sanitizers.gni")
10 10
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 if (is_android_resources && defined(invoker.resource_dirs)) { 280 if (is_android_resources && defined(invoker.resource_dirs)) {
281 resource_dirs = rebase_path(invoker.resource_dirs, root_build_dir) 281 resource_dirs = rebase_path(invoker.resource_dirs, root_build_dir)
282 args += [ "--resource-dirs=$resource_dirs" ] 282 args += [ "--resource-dirs=$resource_dirs" ]
283 } 283 }
284 284
285 if (is_apk) { 285 if (is_apk) {
286 if (defined(invoker.shared_libraries_runtime_deps_file)) { 286 if (defined(invoker.shared_libraries_runtime_deps_file)) {
287 # Don't list shared_libraries_runtime_deps_file as an input in order to 287 # Don't list shared_libraries_runtime_deps_file as an input in order to
288 # avoid having to depend on the runtime_deps target. See comment in 288 # avoid having to depend on the runtime_deps target. See comment in
289 # rules.gni for why we do this. 289 # rules.gni for why we do this.
290 args += [ 290 _rebased_files = rebase_path(invoker.shared_libraries_runtime_deps_file,
agrieve 2016/10/26 19:46:18 nit: can you pluralize this: shared_libraries_runt
291 "--shared-libraries-runtime-deps", 291 root_build_dir)
292 rebase_path(invoker.shared_libraries_runtime_deps_file, 292 args += [ "--shared-libraries-runtime-deps=$_rebased_files" ]
293 root_build_dir),
294 ]
295 } 293 }
296 294
297 if (defined(invoker.secondary_abi_shared_libraries_runtime_deps_file)) { 295 if (defined(invoker.secondary_abi_shared_libraries_runtime_deps_file)) {
298 # Don't list secondary_abi_shared_libraries_runtime_deps_file as an 296 # Don't list secondary_abi_shared_libraries_runtime_deps_file as an
299 # input in order to avoid having to depend on the runtime_deps target. 297 # input in order to avoid having to depend on the runtime_deps target.
300 # See comment in rules.gni for why we do this. 298 # See comment in rules.gni for why we do this.
301 args += [ 299 _secondary_abi_rebased_files = rebase_path(
302 "--secondary-abi-shared-libraries-runtime-deps", 300 invoker.secondary_abi_shared_libraries_runtime_deps_file,
303 rebase_path(invoker.secondary_abi_shared_libraries_runtime_deps_file, 301 root_build_dir)
304 root_build_dir), 302 args += [ "--secondary-abi-shared-libraries-runtime-deps=$_secondary_abi _rebased_files" ]
305 ]
306 } 303 }
307 304
308 if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) { 305 if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
309 args += [ 306 args += [
310 "--proguard-enabled", 307 "--proguard-enabled",
311 "--proguard-info", 308 "--proguard-info",
312 rebase_path(invoker.proguard_info, root_build_dir), 309 rebase_path(invoker.proguard_info, root_build_dir),
313 ] 310 ]
314 } 311 }
315 312
(...skipping 2387 matching lines...) Expand 10 before | Expand all | Expand 10 after
2703 rebase_path(root_build_dir, root_build_dir), 2700 rebase_path(root_build_dir, root_build_dir),
2704 "--packed-libraries-dir", 2701 "--packed-libraries-dir",
2705 rebase_path(_packed_libraries_dir, root_build_dir), 2702 rebase_path(_packed_libraries_dir, root_build_dir),
2706 "--libraries=${invoker.libraries_filearg}", 2703 "--libraries=${invoker.libraries_filearg}",
2707 "--filelistjson", 2704 "--filelistjson",
2708 rebase_path(invoker.file_list_json, root_build_dir), 2705 rebase_path(invoker.file_list_json, root_build_dir),
2709 ] 2706 ]
2710 } 2707 }
2711 } 2708 }
2712 } 2709 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698