Commit 33a62f66 authored by mrefaat's avatar mrefaat Committed by Commit Bot

Roll MDFInternationalization to v1.0.3.

Notable change:
-   define IS_BAZEL_BUILD to build as a static library instead of
    building a framework bundle

Bug: 785248
Change-Id: Ie1aa8ff9439dcae4be1ec8c2185057b4b171b453
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Reviewed-on: https://chromium-review.googlesource.com/802694
Commit-Queue: Mohammad Refaat <mrefaat@chromium.org>
Reviewed-by: default avatarPeter Lee <pkl@chromium.org>
Reviewed-by: default avatarLouis Romero <lpromero@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521149}
parent dc3b79aa
...@@ -203,7 +203,7 @@ deps = { ...@@ -203,7 +203,7 @@ deps = {
}, },
'src/ios/third_party/material_internationalization_ios/src': { 'src/ios/third_party/material_internationalization_ios/src': {
'url': Var('chromium_git') + '/external/github.com/material-foundation/material-internationalization-ios.git' + '@' + '5b0f22e4715305ddc3a8810f5939be3f07cb7e3e', 'url': Var('chromium_git') + '/external/github.com/material-foundation/material-internationalization-ios.git' + '@' + 'fa05ea39c50b232917232c0d6e8b5a34caf7f43f',
'condition': 'checkout_ios', 'condition': 'checkout_ios',
}, },
......
...@@ -268,14 +268,10 @@ source_set("material_components_ios") { ...@@ -268,14 +268,10 @@ source_set("material_components_ios") {
":material_collection_cells_bundle", ":material_collection_cells_bundle",
":material_collections_bundle", ":material_collections_bundle",
":material_component_ic_arrow_back_bundle", ":material_component_ic_arrow_back_bundle",
"//ios/third_party/material_internationalization_ios:material_internationalization_ios+link", "//ios/third_party/material_internationalization_ios",
"//ios/third_party/material_text_accessibility_ios", "//ios/third_party/material_text_accessibility_ios",
] ]
if (current_toolchain == default_toolchain) {
deps += [ "//ios/third_party/material_internationalization_ios:material_internationalization_ios+bundle" ]
}
foreach(icon_name, _icon_names) { foreach(icon_name, _icon_names) {
deps += [ ":material_component_${icon_name}_bundle" ] deps += [ ":material_component_${icon_name}_bundle" ]
} }
......
...@@ -9,10 +9,10 @@ import("//ios/build/chrome_build.gni") ...@@ -9,10 +9,10 @@ import("//ios/build/chrome_build.gni")
config("config") { config("config") {
include_dirs = [ "src/Sources" ] include_dirs = [ "src/Sources" ]
visibility = [ ":material_internationalization_ios" ] visibility = [ ":material_internationalization_ios" ]
defines = [ "IS_BAZEL_BUILD" ]
} }
ios_framework_bundle("material_internationalization_ios") { source_set("material_internationalization_ios") {
output_name = "MDFInternationalization"
sources = [ sources = [
"src/Sources/MDFInternationalization.h", "src/Sources/MDFInternationalization.h",
"src/Sources/MDFRTL.h", "src/Sources/MDFRTL.h",
...@@ -22,7 +22,8 @@ ios_framework_bundle("material_internationalization_ios") { ...@@ -22,7 +22,8 @@ ios_framework_bundle("material_internationalization_ios") {
"src/Sources/UIView+MaterialRTL.h", "src/Sources/UIView+MaterialRTL.h",
"src/Sources/UIView+MaterialRTL.m", "src/Sources/UIView+MaterialRTL.m",
] ]
public_headers = [ public = [
"src/Sources/MDFInternationalization.h",
"src/Sources/MDFRTL.h", "src/Sources/MDFRTL.h",
"src/Sources/UIImage+MaterialRTL.h", "src/Sources/UIImage+MaterialRTL.h",
"src/Sources/UIView+MaterialRTL.h", "src/Sources/UIView+MaterialRTL.h",
...@@ -38,18 +39,20 @@ ios_framework_bundle("material_internationalization_ios") { ...@@ -38,18 +39,20 @@ ios_framework_bundle("material_internationalization_ios") {
"//build/config/compiler:chromium_code", "//build/config/compiler:chromium_code",
] ]
configs += [ configs += [
":config",
"//build/config/compiler:enable_arc", "//build/config/compiler:enable_arc",
"//build/config/compiler:no_chromium_code", "//build/config/compiler:no_chromium_code",
"//build/config/gcc:symbol_visibility_default", "//build/config/gcc:symbol_visibility_default",
] ]
}
_project_version = "1.0" # TODO(crbug.com/785248): remove those targets when downstream has been fixed
_bundle_identifier = # to no longer use it but instead depend on :material_internationalization_ios.
"$ios_app_bundle_id_prefix.$chromium_bundle_id.$output_name" group("material_internationalization_ios+link") {
public_deps = [
info_plist = "src/Sources/Info.plist" ":material_internationalization_ios",
extra_substitutions = [
"PRODUCT_BUNDLE_IDENTIFIER=$_bundle_identifier",
"CURRENT_PROJECT_VERSION=$_project_version",
] ]
} }
group("material_internationalization_ios:bundle") {
}
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