!189 回退 'Pull Request !185 : 提供icu ndk接口'

Merge pull request !189 from openharmony_ci/revert-merge-185-master

bundle.json

@@ -14,7 +14,7 @@
         "subsystem": "thirdparty",
         "syscap": [],
         "features": ["icu_support_locales"],
-        "adapted_system_type": [ "mini", "small", "standard" ],
+        "adapted_system_type": [ "standard" ],
         "rom": "",
         "ram": "",
         "deps": {
@@ -25,18 +25,9 @@
             "sub_component": [
                 "//third_party/icu/icu4c:ohos_icudat",
                 "//third_party/icu/icu4c:shared_icuuc",
-                "//third_party/icu/icu4c:shared_icui18n",
-                "//third_party/icu/ohos_icu4c:icundk"
-            ],
-            "inner_kits": [
-                {
-                    "name": "//third_party/icu/ohos_icu4c:icundk",
-                    "header": {
-                        "header_files": [],
-                        "header_base": ""
-                    }
-                }
+                "//third_party/icu/icu4c:shared_icui18n"
             ],
+            "inner_kits": [],
             "test": []
         }
     }

ohos_icu4c/BUILD.gn

@@ -1,41 +0,0 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build/ohos.gni")
-import("//build/ohos/ndk/ndk.gni")
-
-ohos_shared_library("icundk") {
-  ldflags = [
-    "-shared",
-    "-lm",
-  ]
-  configs = [
-    "//third_party/icu/icu4c:icu_config",
-    "//build/config/compiler:rtti",
-  ]
-  include_dirs = [ "//third_party/icu/icu4c/source/common" ]
-
-  sources = [ "src/icu_addon.cpp" ]
-
-  deps = [
-    "//third_party/icu/icu4c:shared_icui18n",
-    "//third_party/icu/icu4c:shared_icuuc",
-  ]
-
-  version_script = "libicu.map"
-  output_name = "icu"
-  output_extension = "so"
-  relative_install_dir = "ndk"
-  subsystem_name = "thirdparty"
-  part_name = "icu"
-}

ohos_icu4c/libicu.map

@@ -1,68 +0,0 @@
-{
-  global:
-    ucnv_compareNames;
-    ucnv_open;
-    ucnv_openU;
-    ucnv_openCCSID;
-    ucnv_openPackage;
-    ucnv_clone;
-    ucnv_close;
-    ucnv_getSubstChars;
-    ucnv_setSubstChars;
-    ucnv_setSubstString;
-    ucnv_getInvalidChars;
-    ucnv_getInvalidUChars;
-    ucnv_reset;
-    ucnv_resetToUnicode;
-    ucnv_resetFromUnicode;
-    ucnv_getMaxCharSize;
-    ucnv_getMinCharSize;
-    ucnv_getDisplayName;
-    ucnv_getName;
-    ucnv_getCCSID;
-    ucnv_getPlatform;
-    ucnv_getType;
-    ucnv_getStarters;
-    ucnv_getToUCallBack;
-    ucnv_getFromUCallBack;
-    ucnv_setToUCallBack;
-    ucnv_setFromUCallBack;
-    ucnv_fromUnicode;
-    ucnv_toUnicode;
-    ucnv_fromUChars;
-    ucnv_toUChars;
-    ucnv_getNextUChar;
-    ucnv_convertEx;
-    ucnv_convert;
-    ucnv_toAlgorithmic;
-    ucnv_fromAlgorithmic;
-    ucnv_flushCache;
-    ucnv_countAvailable;
-    ucnv_getAvailableName;
-    ucnv_openAllNames;
-    ucnv_countAliases;
-    ucnv_getAlias;
-    ucnv_getAliases;
-    ucnv_openStandardNames;
-    ucnv_countStandards;
-    ucnv_getStandard;
-    ucnv_getStandardName;
-    ucnv_getCanonicalName;
-    ucnv_getDefaultName;
-    ucnv_setDefaultName;
-    ucnv_fixFileSeparator;
-    ucnv_isAmbiguous;
-    ucnv_setFallback;
-    ucnv_usesFallback;
-    ucnv_detectUnicodeSignature;
-    ucnv_fromUCountPending;
-    ucnv_toUCountPending;
-    ucnv_isFixedWidth;
-    uenum_close;
-    uenum_count;
-    uenum_unext;
-    uenum_next;
-    uenum_reset;
-  local:
-    *;
-};