From bb51261a6e1079af7a172bd6fed64538ca42beb2 Mon Sep 17 00:00:00 2001
From: huangjiewen <huangjiewen2@huawei.com>
Date: Fri, 1 Sep 2023 21:08:06 +0800
Subject: [PATCH 1/2] OAT ADD

Signed-off-by: huangjiewen <huangjiewen2@huawei.com>
---
 OAT.xml           | 168 ++++++++++++++++++++++++++++++++++++++++++++++
 README.OpenSource |  10 +++
 2 files changed, 178 insertions(+)
 create mode 100644 OAT.xml
 create mode 100644 README.OpenSource

diff --git a/OAT.xml b/OAT.xml
new file mode 100644
index 00000000..63f814e7
--- /dev/null
+++ b/OAT.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 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.
+
+    This is the configuration file template for OpenHarmony OSS Audit Tool, please copy it to your
+project root dir and modify it refer to OpenHarmony/tools_oat/README.
+    All configurations in this file will be merged to OAT-Default.xml, if you have any questions or
+concerns, please create issue in OpenHarmony/tools_oat and @jalenchen or chenyaxun.
+
+    licensefile:
+    1.If the project don't have "LICENSE" in root dir, please define all the license files in this
+project in , OAT will check license files according to this rule.
+
+    policylist:
+    1. policy: If the OAT-Default.xml policies do not meet your requirements, please add policies here.
+    2. policyitem: The fields type, name, path, desc is required, and the fields rule, group,
+filefilter is optional,the default value is:
+    <policyitem type="" name="" path="" desc="" rule="may" group="defaultGroup"
+filefilter="defaultPolicyFilter"/>
+    3. policyitem type:
+        "compatibility" is used to check license compatibility in the specified path;
+        "license" is used to check source license header in the specified path;
+        "copyright" is used to check source copyright header in the specified path;
+        "import" is used to check source dependency in the specified path, such as import ... ,include ...
+        "filetype" is used to check file type in the specified path, supported file types: archive, binary
+        "filename" is used to check whether the specified file exists in the specified path(projectroot
+means the root dir of the project), supported file names: LICENSE, README, README.OpenSource
+    4. policyitem name: This field is used for define the license, copyright, "*" means match all, the
+"!" prefix means could not match this value. For example, "!GPL" means can not use GPL license.
+    5. policyitem path: This field is used for define the source file scope to apply this policyitem,
+the "!" prefix means exclude the files. For example, "!.*/lib/.*" means files in lib dir will be
+exclude while process this policyitem.
+    6. policyitem rule and group: These two fields are used together to merge policy results. "may"
+policyitems in the same group means any one in this group passed, the result will be passed.
+    7. policyitem filefilter: Used to bind filefilter which define filter rules.
+    7. policyitem desc: Used to describe the reason of this policy item, committers will check this
+while merging the code.
+    8. filefilter: Filter rules, the type filename is used to filter file name, the type filepath is
+used to filter file path.
+
+    Note:If the text contains special characters, please escape them according to the following rules:
+    " == &quot;
+    & == &amp;
+    ' == &apos;
+    < == &lt;
+    > == &gt;
+-->
+
+<configuration>
+    <oatconfig>
+        <policylist>
+            <policy name="projectPolicy" desc="">
+                <policyitem type="compatibility" name="FTL" path="third_party/freetype2/include/freetype-android.*" desc="" />
+                <policyitem type="compatibility" name="FTL" path="third_party/freetype2/include/freetype-no-type1/ftoption.h" desc="" />
+                <policyitem type="compatibility" name="PublicDomainLicense" path="tools/sk_app/unix.*" desc="" />
+                <policyitem type="compatibility" name="Khronos" path="src/sksl.*" desc="" />
+                <policyitem type="compatibility" name="Google" path="gm.*" desc="" />
+                <policyitem type="compatibility" name="Google1" path="gm.*" desc="" />
+                <policyitem type="compatibility" name="Google2" path="gm.*" desc="" />
+                <!-- <policyitem type="compatibility" name="Khronos License" path=".*" desc="" />
+                <policyitem type="compatibility" name="Apache-2.0" path=".*" desc="" />
+                <policyitem type="compatibility" name="GPLStyleLicense" path=".*" desc="" />
+                <policyitem type="compatibility" name="LLVM License" path="third_party/llvm-subzero.*" desc="" />
+                <policyitem type="compatibility" name="LLVM License" path="third_party/subzero.*" desc="" />
+                <policyitem type="compatibility" name="LLVM License" path="third_party/llvm-10.0.*" desc="" />
+                <policyitem type="compatibility" name="GPL-3.0+" path=".*" desc="" />
+                <policyitem type="compatibility" name="Spencer-94" path=".*" desc="" />
+                <policyitem type="compatibility" name="OpenBSD" path=".*" desc="" />
+                <policyitem type="compatibility" name="original license" path="third_party/llvm-subzero/include/llvm/Support.*" desc="" />
+                <policyitem type="compatibility" name="original license" path="third_party/llvm-10.0/llvm/include/llvm/Support.*" desc="" />
+                <policyitem type="compatibility" name="Khronos License2" path="include.*" desc="" />
+                <policyitem type="compatibility" name="Khronos License3" path="include.*" desc="" /> -->
+            </policy>
+        </policylist>
+        <filefilterlist>
+            <filefilter name="defaultPolicyFilter"
+                desc="Filters for compatibility,license header policies">
+                <filteritem type="filepath" name="third_party/llvm-10.0/llvm/include/llvm/Support/LICENSE.TXT"
+                    desc="" />
+                <filteritem type="filepath" name="third_party/SPIRV-Tools/BUILD.bazel"
+                    desc="" />
+                <filteritem type="filepath" name="third_party/llvm-subzero/LICENSE.TXT"
+                    desc="" />
+                <filteritem type="filepath" name="third_party/subzero/LICENSE.TXT"
+                    desc="" />
+                <filteritem type="filepath" name="third_party/subzero/bloat/README.chromium"
+                    desc="" />
+                <filteritem type="filepath" name="third_party/llvm-10.0/Android.bp"
+                    desc="" />
+                <filteritem type="filepath" name="third_party/SPIRV-Headers/BUILD.bazel"
+                    desc="" />
+                <filteritem type="filepath" name="README.OpenSource"
+                    desc="" />
+                <filteritem type="filepath" name=".*chromium"
+                    desc="" />
+                <filteritem type="filepath" name="bin/compare"
+                    desc="" />
+                <filteritem type="filepath" name="tools/doxygen/mainpage/mainpage.dox"
+                    desc="" />
+                <filteritem type="filepath" name="third_party/etc1/README.google"
+                    desc="" />
+                </filefilter>
+                <filefilter name="defaultFilter">
+                <filteritem type="filepath" name="README.OpenSource"
+                    desc="" />
+            </filefilter> 
+        </filefilterlist>
+        <licensematcherlist>
+            <!-- <licensematcher name="LLVM License" desc="">
+                <licensetext name="
+                /* This file is distributed under the University of Illinois Open Source      */
+                /* License. See LICENSE.TXT for details.                                      */
+                " desc="" />
+                </licensematcher>
+            <licensematcher name="OpenBSD" desc="">
+                <licensetext name="
+                * This code is derived from OpenBSD's libc, original license follows:
+                *
+                * Copyright (c) 1998 Todd C. Miller &gt;Todd.Miller@courtesan.com&gt;
+            " desc="" />
+            </licensematcher>
+            <licensematcher name="original license" desc="">
+                <licensetext name="
+                * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
+                * MD5 Message-Digest Algorithm (RFC 1321).
+            " desc="" />
+            </licensematcher>
+            <licensematcher name="Khronos License2" desc="">
+                <licensetext name="
+                * Copyright (c) 2008-2018 The Khronos Group Inc.
+            " desc="" />
+            </licensematcher>
+            <licensematcher name="Khronos License3" desc="">
+                <licensetext name="
+                * Copyright (c) 2007-2016 The Khronos Group Inc
+            " desc="" />
+            </licensematcher> -->
+            <licensematcher name="Google" desc="">
+                <licensetext name="
+                 * Copyright 2015 Google Inc.
+            " desc="" />
+            </licensematcher> 
+
+            <licensematcher name="Google1" desc="">
+                <licensetext name="
+                 * Copyright 2016 Google Inc.
+            " desc="" />
+            </licensematcher> 
+             <licensematcher name="Google2" desc="">
+                <licensetext name="
+                 * Copyright 2017 Google Inc.
+            " desc="" />
+            </licensematcher>
+        </licensematcherlist>
+    </oatconfig>
+</configuration>
\ No newline at end of file
diff --git a/README.OpenSource b/README.OpenSource
new file mode 100644
index 00000000..3c43c96d
--- /dev/null
+++ b/README.OpenSource
@@ -0,0 +1,10 @@
+[
+    {
+        "Name": "chromium_third_party_skia",                   # 上游开源软件名全称
+        "License": "Google","Google1" ,"Google2"         # 上游开源软件中包含的许可证信息
+        "License File": "LICENSE", "Google","Google1" ,"Google2","Khronos" ,"PublicDomainLicense",FTL"       # 许可证所在文件路径
+        "Version Number": "f85ab491eb97b54d0bfeac19fed27feb499b8912",
+        "Upstream URL": "https://skia.googlesource.com/skia.git@f85ab491eb97b54d0bfeac19fed27feb499b8912",   # 上游软件包发布地址
+        "Description": "skia是个2D向量图形处理函数库，包含字型、坐标转换，以及点阵图都有高效能且简洁的表现"           # 开源软件功能描述
+    }
+]
\ No newline at end of file
-- 
Gitee


From 84e110747fd9a150f721061059a9787fb441bb6d Mon Sep 17 00:00:00 2001
From: huangjiewen <huangjiewen2@huawei.com>
Date: Mon, 4 Sep 2023 19:12:22 +0800
Subject: [PATCH 2/2] OAT ADD

Signed-off-by: huangjiewen <huangjiewen2@huawei.com>
---
 OAT.xml           | 102 ----------------------------------------------
 README.OpenSource |   4 +-
 2 files changed, 2 insertions(+), 104 deletions(-)

diff --git a/OAT.xml b/OAT.xml
index 63f814e7..54574586 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,63 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!-- 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.
-
-    This is the configuration file template for OpenHarmony OSS Audit Tool, please copy it to your
-project root dir and modify it refer to OpenHarmony/tools_oat/README.
-    All configurations in this file will be merged to OAT-Default.xml, if you have any questions or
-concerns, please create issue in OpenHarmony/tools_oat and @jalenchen or chenyaxun.
-
-    licensefile:
-    1.If the project don't have "LICENSE" in root dir, please define all the license files in this
-project in , OAT will check license files according to this rule.
-
-    policylist:
-    1. policy: If the OAT-Default.xml policies do not meet your requirements, please add policies here.
-    2. policyitem: The fields type, name, path, desc is required, and the fields rule, group,
-filefilter is optional,the default value is:
-    <policyitem type="" name="" path="" desc="" rule="may" group="defaultGroup"
-filefilter="defaultPolicyFilter"/>
-    3. policyitem type:
-        "compatibility" is used to check license compatibility in the specified path;
-        "license" is used to check source license header in the specified path;
-        "copyright" is used to check source copyright header in the specified path;
-        "import" is used to check source dependency in the specified path, such as import ... ,include ...
-        "filetype" is used to check file type in the specified path, supported file types: archive, binary
-        "filename" is used to check whether the specified file exists in the specified path(projectroot
-means the root dir of the project), supported file names: LICENSE, README, README.OpenSource
-    4. policyitem name: This field is used for define the license, copyright, "*" means match all, the
-"!" prefix means could not match this value. For example, "!GPL" means can not use GPL license.
-    5. policyitem path: This field is used for define the source file scope to apply this policyitem,
-the "!" prefix means exclude the files. For example, "!.*/lib/.*" means files in lib dir will be
-exclude while process this policyitem.
-    6. policyitem rule and group: These two fields are used together to merge policy results. "may"
-policyitems in the same group means any one in this group passed, the result will be passed.
-    7. policyitem filefilter: Used to bind filefilter which define filter rules.
-    7. policyitem desc: Used to describe the reason of this policy item, committers will check this
-while merging the code.
-    8. filefilter: Filter rules, the type filename is used to filter file name, the type filepath is
-used to filter file path.
-
-    Note:If the text contains special characters, please escape them according to the following rules:
-    " == &quot;
-    & == &amp;
-    ' == &apos;
-    < == &lt;
-    > == &gt;
--->
-
 <configuration>
     <oatconfig>
         <policylist>
@@ -69,19 +10,6 @@ used to filter file path.
                 <policyitem type="compatibility" name="Google" path="gm.*" desc="" />
                 <policyitem type="compatibility" name="Google1" path="gm.*" desc="" />
                 <policyitem type="compatibility" name="Google2" path="gm.*" desc="" />
-                <!-- <policyitem type="compatibility" name="Khronos License" path=".*" desc="" />
-                <policyitem type="compatibility" name="Apache-2.0" path=".*" desc="" />
-                <policyitem type="compatibility" name="GPLStyleLicense" path=".*" desc="" />
-                <policyitem type="compatibility" name="LLVM License" path="third_party/llvm-subzero.*" desc="" />
-                <policyitem type="compatibility" name="LLVM License" path="third_party/subzero.*" desc="" />
-                <policyitem type="compatibility" name="LLVM License" path="third_party/llvm-10.0.*" desc="" />
-                <policyitem type="compatibility" name="GPL-3.0+" path=".*" desc="" />
-                <policyitem type="compatibility" name="Spencer-94" path=".*" desc="" />
-                <policyitem type="compatibility" name="OpenBSD" path=".*" desc="" />
-                <policyitem type="compatibility" name="original license" path="third_party/llvm-subzero/include/llvm/Support.*" desc="" />
-                <policyitem type="compatibility" name="original license" path="third_party/llvm-10.0/llvm/include/llvm/Support.*" desc="" />
-                <policyitem type="compatibility" name="Khronos License2" path="include.*" desc="" />
-                <policyitem type="compatibility" name="Khronos License3" path="include.*" desc="" /> -->
             </policy>
         </policylist>
         <filefilterlist>
@@ -118,41 +46,11 @@ used to filter file path.
             </filefilter> 
         </filefilterlist>
         <licensematcherlist>
-            <!-- <licensematcher name="LLVM License" desc="">
-                <licensetext name="
-                /* This file is distributed under the University of Illinois Open Source      */
-                /* License. See LICENSE.TXT for details.                                      */
-                " desc="" />
-                </licensematcher>
-            <licensematcher name="OpenBSD" desc="">
-                <licensetext name="
-                * This code is derived from OpenBSD's libc, original license follows:
-                *
-                * Copyright (c) 1998 Todd C. Miller &gt;Todd.Miller@courtesan.com&gt;
-            " desc="" />
-            </licensematcher>
-            <licensematcher name="original license" desc="">
-                <licensetext name="
-                * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
-                * MD5 Message-Digest Algorithm (RFC 1321).
-            " desc="" />
-            </licensematcher>
-            <licensematcher name="Khronos License2" desc="">
-                <licensetext name="
-                * Copyright (c) 2008-2018 The Khronos Group Inc.
-            " desc="" />
-            </licensematcher>
-            <licensematcher name="Khronos License3" desc="">
-                <licensetext name="
-                * Copyright (c) 2007-2016 The Khronos Group Inc
-            " desc="" />
-            </licensematcher> -->
             <licensematcher name="Google" desc="">
                 <licensetext name="
                  * Copyright 2015 Google Inc.
             " desc="" />
             </licensematcher> 
-
             <licensematcher name="Google1" desc="">
                 <licensetext name="
                  * Copyright 2016 Google Inc.
diff --git a/README.OpenSource b/README.OpenSource
index 3c43c96d..4ebc6df9 100644
--- a/README.OpenSource
+++ b/README.OpenSource
@@ -1,8 +1,8 @@
 [
     {
         "Name": "chromium_third_party_skia",                   # 上游开源软件名全称
-        "License": "Google","Google1" ,"Google2"         # 上游开源软件中包含的许可证信息
-        "License File": "LICENSE", "Google","Google1" ,"Google2","Khronos" ,"PublicDomainLicense",FTL"       # 许可证所在文件路径
+        "License": "Google","Google1" ,"Google2" ,"Khronos" ,"PublicDomainLicense",FTL"         # 上游开源软件中包含的许可证信息
+        "License File": "LICENSE"       # 许可证所在文件路径
         "Version Number": "f85ab491eb97b54d0bfeac19fed27feb499b8912",
         "Upstream URL": "https://skia.googlesource.com/skia.git@f85ab491eb97b54d0bfeac19fed27feb499b8912",   # 上游软件包发布地址
         "Description": "skia是个2D向量图形处理函数库，包含字型、坐标转换，以及点阵图都有高效能且简洁的表现"           # 开源软件功能描述
-- 
Gitee