From 9d9c2efa71eeb4d6344c126a14db6252b8af33c0 Mon Sep 17 00:00:00 2001
From: huangjiewen <huangjiewen2@huawei.com>
Date: Tue, 17 Oct 2023 20:34:00 +0800
Subject: [PATCH 1/2] OAT ADD

Signed-off-by: huangjiewen <huangjiewen2@huawei.com>
---
 OAT.xml           | 86 +++++++++++++++++++++++++++++++++++++----------
 README.OpenSource | 22 ++++++++----
 2 files changed, 85 insertions(+), 23 deletions(-)

diff --git a/OAT.xml b/OAT.xml
index 69cc603..64e632e 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,4 +1,63 @@
 <?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>
@@ -6,24 +65,17 @@
             </policy>
         </policylist>
         <filefilterlist>
-            <filefilter name="defaultPolicyFilter"
-                desc="Filters for compatibility,license header policies">  
-                <filteritem type="filepath" name="README.OpenSource"
-                    desc="" />
+            <filefilter name="defaultPolicyFilter" desc="Filters for compatibility,license header policies">  
             </filefilter>
-            <filefilter name="defaultFilter">
-                <filteritem type="filepath" name="README.OpenSource"
-                    desc="" />
-                <filteritem type="filepath" name="tests/data/io/cosmos1650_yuv444_10bpc_p3pq.avif"
-                    desc="" />
-                <filteritem type="filepath" name="tests/data/io/kodim03_yuv420_8bpc.avif"
-                    desc="" />
-                <filteritem type="filepath" name="tests/data/io/kodim23_yuv420_8bpc.avif"
-                    desc="" />
-                <filteritem type="filepath" name="android_jni/gradle/wrapper/gradle-wrapper.jar"
-                    desc="" />
-                <filteritem type="filepath" name="tests/data/cosmos1650_yuv444_10bpc_p3pq.y4m"
-                    desc="" />
+            <filefilter name="readmeOpenSourcefileNamePolicFilter">
+                <filteritem type="filepath" name="README.OpenSource" desc="Filter readme.opensource files" />
+            </filefilter>
+            <filefilter name="binaryFileTypePolicyFilter" desc="Check to see if it is a binary file">
+                <filteritem type="filepath" name="tests/data/io/cosmos1650_yuv444_10bpc_p3pq.avif" desc="chromium原生二进制文件,不会使用" />
+                <filteritem type="filepath" name="tests/data/io/kodim03_yuv420_8bpc.avif" desc="chromium原生二进制文件,不会使用" />
+                <filteritem type="filepath" name="tests/data/io/kodim23_yuv420_8bpc.avif"  desc="chromium原生二进制文件,不会使用" />
+                <filteritem type="filepath" name="android_jni/gradle/wrapper/gradle-wrapper.jar" desc="chromium原生二进制文件,不会使用" />
+                <filteritem type="filepath" name="tests/data/cosmos1650_yuv444_10bpc_p3pq.y4m" desc="chromium原生二进制文件,不会使用" />
             </filefilter>
         </filefilterlist>
         <licensematcherlist>
diff --git a/README.OpenSource b/README.OpenSource
index d9e84d2..e0ee575 100644
--- a/README.OpenSource
+++ b/README.OpenSource
@@ -1,10 +1,20 @@
 [
     {
-        "Name": "chromium:libavif",                   # 上游开源软件名全称
-        "License":         # 上游开源软件中包含的许可证信息
-        "License File": "LICENSE"      # 许可证所在文件路径
+        "Name": "chromium:libavif",
+        "License": "BSD-2-Clause",
+        "License File": "LICENSE",
         "Version Number": "91bc33a6bd761f70013d7f0f041262626e1d5cad",
-        "Upstream URL": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git@91bc33a6bd761f70013d7f0f041262626e1d5cad",   # 上游软件包发布地址
-        "Description": "第三方软件libavif"           # 开源软件功能描述
-    }
+        "Owner": "huangjiewen2@huawei.com",
+        "Upstream URL": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git@91bc33a6bd761f70013d7f0f041262626e1d5cad",
+        "Description": "第三方软件libavif"
+    },
+    {
+        "Name": "chromium:libavif",
+        "License": "Apache-2.0",
+        "License File": "LICENSE",
+        "Version Number": "91bc33a6bd761f70013d7f0f041262626e1d5cad",
+        "Owner": "huangjiewen2@huawei.com",
+        "Upstream URL": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git@91bc33a6bd761f70013d7f0f041262626e1d5cad",
+        "Description": "第三方软件libavif"
+    },
 ]
\ No newline at end of file
-- 
Gitee


From 652b2b3e6fc2d3e06405bf46a506586697b51cb2 Mon Sep 17 00:00:00 2001
From: huangjiewen <huangjiewen2@huawei.com>
Date: Thu, 19 Oct 2023 16:48:51 +0800
Subject: [PATCH 2/2] OAT ADD

Signed-off-by: huangjiewen <huangjiewen2@huawei.com>
---
 README.OpenSource | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/README.OpenSource b/README.OpenSource
index e0ee575..e104ee4 100644
--- a/README.OpenSource
+++ b/README.OpenSource
@@ -7,14 +7,5 @@
         "Owner": "huangjiewen2@huawei.com",
         "Upstream URL": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git@91bc33a6bd761f70013d7f0f041262626e1d5cad",
         "Description": "第三方软件libavif"
-    },
-    {
-        "Name": "chromium:libavif",
-        "License": "Apache-2.0",
-        "License File": "LICENSE",
-        "Version Number": "91bc33a6bd761f70013d7f0f041262626e1d5cad",
-        "Owner": "huangjiewen2@huawei.com",
-        "Upstream URL": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git@91bc33a6bd761f70013d7f0f041262626e1d5cad",
-        "Description": "第三方软件libavif"
-    },
+    }
 ]
\ No newline at end of file
-- 
Gitee