diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/chrome/android/webapk/libs/client/BUILD.gn | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/android/webapk/libs/client/BUILD.gn')
| -rw-r--r-- | chromium/chrome/android/webapk/libs/client/BUILD.gn | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chromium/chrome/android/webapk/libs/client/BUILD.gn b/chromium/chrome/android/webapk/libs/client/BUILD.gn index 57d4a97f6ee..8d9697243ad 100644 --- a/chromium/chrome/android/webapk/libs/client/BUILD.gn +++ b/chromium/chrome/android/webapk/libs/client/BUILD.gn @@ -4,6 +4,7 @@ import("//build/config/android/rules.gni") import("//chrome/android/webapk/libs/runtime_library_version.gni") +import("//chrome/android/webapk/shell_apk/shell_apk_version.gni") android_library("client_java") { java_files = [ @@ -14,11 +15,9 @@ android_library("client_java") { ] deps = [ "//chrome/android/webapk/libs/common:common_java", + "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", ] - srcjar_deps = [ - ":runtime_library_version_java", - "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl", - ] + srcjar_deps = [ ":runtime_library_version_java" ] } java_cpp_template("runtime_library_version_java") { @@ -26,7 +25,10 @@ java_cpp_template("runtime_library_version_java") { sources = [ "src/org/chromium/webapk/lib/client/WebApkVersion.template", ] - defines = [ "CURRENT_RUNTIME_DEX_VERSION_VALUE=$runtime_library_version" ] + defines = [ + "CURRENT_RUNTIME_DEX_VERSION_VALUE=$runtime_library_version", + "CURRENT_SHELL_APK_VERSION_VALUE=$shell_apk_version", + ] } junit_binary("webapk_client_junit_tests") { @@ -36,6 +38,6 @@ junit_binary("webapk_client_junit_tests") { ] deps = [ ":client_java", - "//base:base_junit_test_support", + "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java", ] } |