Commit 09b2e344 authored by rouslan's avatar rouslan Committed by Commit bot

[android] Remove libaddressinput Java widget.

Android uses a custom UI with the cross-platform strings for address
input. This is a re-land of http://crrev.com/890103002 with a minor
alteration to fix Android GN build: do not build the validator on
Android.

TBR=estade@chromium.org
BUG=454120

Review URL: https://codereview.chromium.org/867043003

Cr-Commit-Position: refs/heads/master@{#314414}
parent 7b28897b
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2014 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
<grit base_dir="." latest_public_release="0" current_release="1"
source_lang_id="en" enc_check="möl">
<outputs>
<!-- On Android, output all strings into Android's xml string format. -->
<output filename="values-am/address_input_strings.xml" lang="am" type="android" />
<output filename="values-ar/address_input_strings.xml" lang="ar" type="android" />
<output filename="values-bg/address_input_strings.xml" lang="bg" type="android" />
<output filename="values-ca/address_input_strings.xml" lang="ca" type="android" />
<output filename="values-cs/address_input_strings.xml" lang="cs" type="android" />
<output filename="values-da/address_input_strings.xml" lang="da" type="android" />
<output filename="values-de/address_input_strings.xml" lang="de" type="android" />
<output filename="values-el/address_input_strings.xml" lang="el" type="android" />
<output filename="values/address_input_strings.xml" lang="en" type="android" />
<output filename="values-en-rGB/address_input_strings.xml" lang="en-GB" type="android" />
<output filename="values-es/address_input_strings.xml" lang="es" type="android" />
<output filename="values-es-rUS/address_input_strings.xml" lang="es-419" type="android" />
<output filename="values-fa/address_input_strings.xml" lang="fa" type="android" />
<output filename="values-fi/address_input_strings.xml" lang="fi" type="android" />
<output filename="values-tl/address_input_strings.xml" lang="fil" type="android" />
<output filename="values-fr/address_input_strings.xml" lang="fr" type="android" />
<output filename="values-hi/address_input_strings.xml" lang="hi" type="android" />
<output filename="values-hr/address_input_strings.xml" lang="hr" type="android" />
<output filename="values-hu/address_input_strings.xml" lang="hu" type="android" />
<output filename="values-in/address_input_strings.xml" lang="id" type="android" />
<output filename="values-it/address_input_strings.xml" lang="it" type="android" />
<output filename="values-iw/address_input_strings.xml" lang="he" type="android" />
<output filename="values-ja/address_input_strings.xml" lang="ja" type="android" />
<output filename="values-ko/address_input_strings.xml" lang="ko" type="android" />
<output filename="values-lt/address_input_strings.xml" lang="lt" type="android" />
<output filename="values-lv/address_input_strings.xml" lang="lv" type="android" />
<output filename="values-nl/address_input_strings.xml" lang="nl" type="android" />
<output filename="values-nb/address_input_strings.xml" lang="no" type="android" />
<output filename="values-pl/address_input_strings.xml" lang="pl" type="android" />
<output filename="values-pt-rBR/address_input_strings.xml" lang="pt-BR" type="android" />
<output filename="values-pt-rPT/address_input_strings.xml" lang="pt-PT" type="android" />
<output filename="values-ro/address_input_strings.xml" lang="ro" type="android" />
<output filename="values-ru/address_input_strings.xml" lang="ru" type="android" />
<output filename="values-sk/address_input_strings.xml" lang="sk" type="android" />
<output filename="values-sl/address_input_strings.xml" lang="sl" type="android" />
<output filename="values-sr/address_input_strings.xml" lang="sr" type="android" />
<output filename="values-sv/address_input_strings.xml" lang="sv" type="android" />
<output filename="values-sw/address_input_strings.xml" lang="sw" type="android" />
<output filename="values-th/address_input_strings.xml" lang="th" type="android" />
<output filename="values-tr/address_input_strings.xml" lang="tr" type="android" />
<output filename="values-uk/address_input_strings.xml" lang="uk" type="android" />
<output filename="values-vi/address_input_strings.xml" lang="vi" type="android" />
<output filename="values-zh-rCN/address_input_strings.xml" lang="zh-CN" type="android" />
<output filename="values-zh-rTW/address_input_strings.xml" lang="zh-TW" type="android" />
</outputs>
<!-- Chromium translations. -->
<translations>
<part file="address_input_strings_translations.grdp" />
</translations>
<release seq="1" allow_pseudo="false">
<messages fallback_to_english="true">
<part file="address_input_strings.grdp" />
</messages>
</release>
</grit>
...@@ -124,77 +124,7 @@ static_library("util") { ...@@ -124,77 +124,7 @@ static_library("util") {
] ]
} }
if (is_android) { if (!is_android) {
import("//build/config/android/rules.gni")
# GYP: //third_party/libaddressinput/libaddressinput.gyp:libaddressinput_android_strings_grd
java_strings_grd("libaddressinput_android_strings_grd") {
grd_file = "//chrome/app/address_input_strings_android.grd"
outputs = [
"values-am/address_input_strings.xml",
"values-ar/address_input_strings.xml",
"values-bg/address_input_strings.xml",
"values-ca/address_input_strings.xml",
"values-cs/address_input_strings.xml",
"values-da/address_input_strings.xml",
"values-de/address_input_strings.xml",
"values-el/address_input_strings.xml",
"values-en-rGB/address_input_strings.xml",
"values-es-rUS/address_input_strings.xml",
"values-es/address_input_strings.xml",
"values-fa/address_input_strings.xml",
"values-fi/address_input_strings.xml",
"values-fr/address_input_strings.xml",
"values-hi/address_input_strings.xml",
"values-hr/address_input_strings.xml",
"values-hu/address_input_strings.xml",
"values-in/address_input_strings.xml",
"values-it/address_input_strings.xml",
"values-iw/address_input_strings.xml",
"values-ja/address_input_strings.xml",
"values-ko/address_input_strings.xml",
"values-lt/address_input_strings.xml",
"values-lv/address_input_strings.xml",
"values-nb/address_input_strings.xml",
"values-nl/address_input_strings.xml",
"values-pl/address_input_strings.xml",
"values-pt-rBR/address_input_strings.xml",
"values-pt-rPT/address_input_strings.xml",
"values-ro/address_input_strings.xml",
"values-ru/address_input_strings.xml",
"values-sk/address_input_strings.xml",
"values-sl/address_input_strings.xml",
"values-sr/address_input_strings.xml",
"values-sv/address_input_strings.xml",
"values-sw/address_input_strings.xml",
"values-th/address_input_strings.xml",
"values-tl/address_input_strings.xml",
"values-tr/address_input_strings.xml",
"values-uk/address_input_strings.xml",
"values-vi/address_input_strings.xml",
"values-zh-rCN/address_input_strings.xml",
"values-zh-rTW/address_input_strings.xml",
"values/address_input_strings.xml",
]
}
android_resources("android_addressinput_widget_resources") {
deps = [
":libaddressinput_android_strings_grd",
]
custom_package = "com.android.i18n.addressinput"
resource_dirs = [ "src/java/res" ]
v14_verify_only = true
}
# GYP: //third_party/libaddressinput/libaddressinput.gyp:android_addressinput_widget
android_library("android_addressinput_widget_java") {
DEPRECATED_java_in_dir = "src/java/src"
deps = [
":android_addressinput_widget_resources",
]
}
} else {
# The list of files in libaddressinput.gypi. # The list of files in libaddressinput.gypi.
gypi_values = exec_script("//build/gypi_to_gn.py", gypi_values = exec_script("//build/gypi_to_gn.py",
[ rebase_path("src/cpp/libaddressinput.gypi") ], [ rebase_path("src/cpp/libaddressinput.gypi") ],
......
...@@ -161,41 +161,4 @@ ...@@ -161,41 +161,4 @@
], ],
}, },
], ],
'conditions': [
['OS=="android"', {
'targets': [
{
# GN: //third_party/libaddressinput:libaddressinput_android_strings_grd
'target_name': 'libaddressinput_android_strings_grd',
'type': 'none',
'android_unmangled_name': 1,
'variables': {
'grd_file': '../../chrome/app/address_input_strings_android.grd',
},
'includes': [
'../../build/java_strings_grd.gypi',
],
},
{
# GN: //third_party/libaddressinput:android_addressinput_widget_java
'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',
],
'dependencies': [
'libaddressinput_android_strings_grd',
],
},
],
},],
],
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment