diff options
| -rw-r--r-- | DEPS | 7 | ||||
| -rwxr-xr-x | android_webview/buildbot/deps_whitelist.py | 2 | ||||
| -rw-r--r-- | third_party/libaddressinput/libaddressinput.gyp | 21 |
3 files changed, 24 insertions, 6 deletions
@@ -271,11 +271,8 @@ deps = { "src/third_party/smhasher/src": (Var("googlecode_url") % "smhasher") + "/trunk@152", - "src/third_party/libaddressinput/src/cpp": - (Var("googlecode_url") % "libaddressinput") + "/trunk/cpp@" + - Var("libaddressinput_revision"), - "src/third_party/libaddressinput/src/testdata": - (Var("googlecode_url") % "libaddressinput") + "/trunk/testdata@" + + "src/third_party/libaddressinput/src": + (Var("googlecode_url") % "libaddressinput") + "/trunk@" + Var("libaddressinput_revision"), "src/third_party/libphonenumber/src/phonenumbers": diff --git a/android_webview/buildbot/deps_whitelist.py b/android_webview/buildbot/deps_whitelist.py index 9a317f5..e2d8919 100755 --- a/android_webview/buildbot/deps_whitelist.py +++ b/android_webview/buildbot/deps_whitelist.py @@ -31,7 +31,7 @@ class DepsWhitelist(object): # team and are in the process of having the required branches being created # in the Android tree. self._compile_but_not_snapshot_dependencies = [ - 'third_party/libaddressinput/src/cpp', + 'third_party/libaddressinput/src', 'third_party/boringssl/src', ] diff --git a/third_party/libaddressinput/libaddressinput.gyp b/third_party/libaddressinput/libaddressinput.gyp index 3fca856..698cbb5 100644 --- a/third_party/libaddressinput/libaddressinput.gyp +++ b/third_party/libaddressinput/libaddressinput.gyp @@ -161,4 +161,25 @@ ], }, ], + 'conditions': [ + ['OS=="android"', { + 'targets': [ + { + 'target_name': 'android_addressinput_widget', + 'type': 'none', + 'variables': { + 'java_in_dir': 'src/java', + 'never_lint': 1, + 'res_v14_verify_only': 1, + 'has_java_resources': 1, + 'R_package': 'com.android.i18n.addressinput', + 'R_package_relpath': 'com/android/i18n/addressinput', + }, + 'includes': [ + '../../build/java.gypi', + ], + }, + ], + },], + ], } |