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

Unified Diff: chrome/test/BUILD.gn

Issue 1421473010: Replace most uses of asset_location with android_assets() template (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/chrome_public_apk_tmpl.gni ('k') | content/content_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index a795e1237d787f803eb631161d1e2cc8fcaa0d3f..541a0448e2ace8b012348cf65ab1e7b5a31c7588 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1618,10 +1618,11 @@ test("unit_tests") {
android_manifest =
"//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
- apk_asset_location = "$root_out_dir/unit_tests_apk/assets"
- apk_deps = [ ":unit_tests_java" ]
+ apk_deps = [
+ ":unit_tests_java",
+ "//v8:v8_external_startup_data_assets",
+ ]
isolate_file = "../unit_tests.isolate"
- deps += [ ":copy_unit_tests_apk_assets" ]
# Some android targets still depend on --gc-sections to link.
# TODO: remove --gc-sections for Debug builds (crbug.com/159847).
@@ -2198,19 +2199,6 @@ source_set("test_support_unit") {
}
if (is_android) {
- copy_ex("copy_unit_tests_apk_assets") {
- clear_dir = true
- dest = "$root_out_dir/unit_tests_apk/assets"
-
- if (v8_use_external_startup_data) {
- renaming_sources = v8_external_startup_data_renaming_sources
- renaming_destinations = v8_external_startup_data_renaming_destinations
- deps = [
- "//v8",
- ]
- }
- }
-
android_library("unit_tests_java") {
DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
deps = [
« no previous file with comments | « chrome/android/chrome_public_apk_tmpl.gni ('k') | content/content_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698