OLD | NEW |
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 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
7 import("//build/module_args/v8.gni") | 7 import("//build/module_args/v8.gni") |
8 import("//chrome/version.gni") | 8 import("//chrome/version.gni") |
9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
10 import("//third_party/icu/config.gni") | 10 import("//third_party/icu/config.gni") |
(...skipping 25 matching lines...) Expand all Loading... |
36 locale_pak_resources("chrome_locale_paks") { | 36 locale_pak_resources("chrome_locale_paks") { |
37 sources = chrome_android_paks_gypi.chrome_android_pak_locale_resources | 37 sources = chrome_android_paks_gypi.chrome_android_pak_locale_resources |
38 | 38 |
39 deps = [ | 39 deps = [ |
40 "//chrome:packed_resources", | 40 "//chrome:packed_resources", |
41 ] | 41 ] |
42 } | 42 } |
43 | 43 |
44 # GYP: //chrome/chrome.gyp:chrome_java (resources part) | 44 # GYP: //chrome/chrome.gyp:chrome_java (resources part) |
45 android_resources("chrome_java_resources") { | 45 android_resources("chrome_java_resources") { |
46 resource_dirs = [ | 46 if (!defined(android_branding_res_dirs)) { |
47 "java/res", | 47 android_branding_res_dirs = [ "//chrome/android/java/res_chromium" ] |
48 "java/res_default", | 48 } |
49 ] | 49 resource_dirs = [ "java/res" ] + android_branding_res_dirs |
50 deps = [ | 50 deps = [ |
51 ":chrome_locale_paks", | 51 ":chrome_locale_paks", |
52 ":chrome_strings_grd", | 52 ":chrome_strings_grd", |
53 "//components/policy:app_restrictions_resources", | 53 "//components/policy:app_restrictions_resources", |
54 "//content/public/android:content_java_resources", | 54 "//content/public/android:content_java_resources", |
55 "//chrome/app:java_strings_grd", | 55 "//chrome/app:java_strings_grd", |
56 "//third_party/android_data_chart:android_data_chart_java_resources", | 56 "//third_party/android_data_chart:android_data_chart_java_resources", |
57 "//third_party/android_media:android_media_resources", | 57 "//third_party/android_media:android_media_resources", |
58 ] | 58 ] |
59 if (!enable_configuration_policy) { | 59 if (!enable_configuration_policy) { |
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
748 # TODO(GYP,cjhopman): Does this need version code/name? | 748 # TODO(GYP,cjhopman): Does this need version code/name? |
749 apk_name = "ChromePublicTest" | 749 apk_name = "ChromePublicTest" |
750 apk_under_test = ":chrome_public_apk" | 750 apk_under_test = ":chrome_public_apk" |
751 android_manifest = chrome_public_test_apk_manifest | 751 android_manifest = chrome_public_test_apk_manifest |
752 deps = [ | 752 deps = [ |
753 ":chrome_public_test_apk_manifest", | 753 ":chrome_public_test_apk_manifest", |
754 "//chrome/android:chrome_shared_test_java", | 754 "//chrome/android:chrome_shared_test_java", |
755 ] | 755 ] |
756 isolate_file = "../chrome_public_test_apk.isolate" | 756 isolate_file = "../chrome_public_test_apk.isolate" |
757 } | 757 } |
OLD | NEW |