diff --git a/OAT.xml b/OAT.xml
index 54574586ca95de77e8d651bf18079ca573afcd26..77c39ed88ca38777190e28fcceec62426cf6d6ea 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -3,62 +3,105 @@
     <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="FTL" path="third_party/freetype2/include/freetype-android.*" 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="" />
             </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"
+                <filteritem type="filepath" name="tools/doxygen/mainpage/mainpage.dox"
+                    desc="" />
+                <filteritem type="filepath" name="bin/compare"
+                    desc="" />
+                <filteritem type="filepath" name="README.OpenSource"
                     desc="" />
-                <filteritem type="filepath" name="third_party/SPIRV-Tools/BUILD.bazel"
+                </filefilter>
+                <filefilter name="defaultFilter">
+                <filteritem type="filepath" name="README.OpenSource"
                     desc="" />
-                <filteritem type="filepath" name="third_party/llvm-subzero/LICENSE.TXT"
+                <filteritem type="filepath" name=".*png"
                     desc="" />
-                <filteritem type="filepath" name="third_party/subzero/LICENSE.TXT"
+                <filteritem type="filepath" name=".*jpg"
                     desc="" />
-                <filteritem type="filepath" name="third_party/subzero/bloat/README.chromium"
+                <filteritem type="filepath" name="resources/images.*gif"
                     desc="" />
-                <filteritem type="filepath" name="third_party/llvm-10.0/Android.bp"
+                <filteritem type="filepath" name="tools/skiaserve.*ico"
                     desc="" />
-                <filteritem type="filepath" name="third_party/SPIRV-Headers/BUILD.bazel"
+                <filteritem type="filepath" name="resources/empty_images.*ico"
                     desc="" />
-                <filteritem type="filepath" name="README.OpenSource"
+                <filteritem type="filepath" name="modules/canvaskit/tests/assets.*webp"
                     desc="" />
-                <filteritem type="filepath" name=".*chromium"
+                <filteritem type="filepath" name="resources/images.*webp"
                     desc="" />
-                <filteritem type="filepath" name="bin/compare"
+                <filteritem type="filepath" name=".*resources.*"
                     desc="" />
-                <filteritem type="filepath" name="tools/doxygen/mainpage/mainpage.dox"
+                <filteritem type="filepath" name=".*modules/canvaskit/tests/assets.*"
                     desc="" />
-                <filteritem type="filepath" name="third_party/etc1/README.google"
+                <filteritem type="filepath" name="platform_tools/android/bin/linux/perfhost"
                     desc="" />
-                </filefilter>
-                <filefilter name="defaultFilter">
-                <filteritem type="filepath" name="README.OpenSource"
+                <filteritem type="filepath" name="platform_tools/android/bin/mac/perfhost"
+                    desc="" />
+                <filteritem type="filepath" name="site/docs/dev/tools/calendar.mskp"
+                    desc="" />
+                <filteritem type="filepath" name="experimental/wasm-skp-debugger/debugger/anim.mskp"
+                    desc="" />
+                <filteritem type="filepath" name="platform_tools/android/apps/gradle/wrapper/gradle-wrapper.jar"
+                    desc="" />
+                <filteritem type="filepath" name="experimental/wasm-skp-debugger/debugger/sample.skp"
+                    desc="" />
+                <filteritem type="filepath" name="infra/bots/tools/luci-go/win64/isolate.exe.sha1"
+                    desc="" />
+                <filteritem type="filepath" name="tools/perf-canvaskit-puppeteer/canvas_perf_assets/Roboto-Regular.ttf"
+                    desc="" />
+                <filteritem type="filepath" name="experimental/wasm-skp-debugger/fonts/NotoMono-Regular.ttf"
+                    desc="" />
+                <filteritem type="filepath" name="platform_tools/android/apps/skottie/perfetto_config.pb"
+                    desc="" />
+                <filteritem type="filepath" name="tools/perf-canvaskit-puppeteer/canvas_perf_assets/Roboto-Regular.woff2"
+                    desc="" />
+                <filteritem type="filepath" name="modules/canvaskit/fonts/NotoMono-Regular.ttf"
+                    desc="" />
+                <filteritem type="filepath" name="tools/perf-canvaskit-puppeteer/canvas_perf_assets/Roboto-Regular.woff"
                     desc="" />
             </filefilter> 
         </filefilterlist>
         <licensematcherlist>
-            <licensematcher name="Google" desc="">
+            <licensematcher name="BSD-3-Clause" desc="">
+                <licensetext name="
+                * * Use of this source code is governed by a BD-style license that can be
+                 * found in the LICENSE file.
+            " desc="" />
+            </licensematcher>
+            <licensematcher name="BSD-3-Clause" desc="">
                 <licensetext name="
-                 * Copyright 2015 Google Inc.
+                Name: Skia
+                URL: https://skia.org/
+                Version: unknown
+                Security Critical: yes
+                License: BSD
             " desc="" />
-            </licensematcher> 
-            <licensematcher name="Google1" desc="">
+            </licensematcher>
+            <licensematcher name="Apache-2.0" desc="">
                 <licensetext name="
-                 * Copyright 2016 Google Inc.
+                URL: https://android.googlesource.com/platform/frameworks/native/+/master/opengl/
+                Version: 01cc538b
+                License: Apache 2.0
+                License File: LICENSE
+                Description: PKM file format (ETC1 data) support
+                Local Modifications: Created LICENSE file for compliance purposes. Not included in original
+                distribution.
             " desc="" />
-            </licensematcher> 
-             <licensematcher name="Google2" desc="">
+            </licensematcher>
+             <licensematcher name="BSD-3-Clause" desc="">
                 <licensetext name="
-                 * Copyright 2017 Google Inc.
+                Name: skcms
+                URL: https://skia.org/
+                Version: unknown
+                Security Critical: yes
+                License: BSD
             " desc="" />
             </licensematcher>
         </licensematcherlist>
diff --git a/README.OpenSource b/README.OpenSource
index 4ebc6df95638d1ab92a1919b7390077f4681951b..e6971c7f3d4627f6820c87574a3e1bf42801bc70 100644
--- a/README.OpenSource
+++ b/README.OpenSource
@@ -1,7 +1,39 @@
 [
     {
-        "Name": "chromium_third_party_skia",                   # 上游开源软件名全称
-        "License": "Google","Google1" ,"Google2" ,"Khronos" ,"PublicDomainLicense",FTL"         # 上游开源软件中包含的许可证信息
+        "Name": "skia",                   # 上游开源软件名全称
+        "License": "Khronos"       # 上游开源软件中包含的许可证信息
+        "License File": "LICENSE"       # 许可证所在文件路径
+        "Version Number": "f85ab491eb97b54d0bfeac19fed27feb499b8912",
+        "Upstream URL": "https://skia.googlesource.com/skia.git@f85ab491eb97b54d0bfeac19fed27feb499b8912",   # 上游软件包发布地址
+        "Description": "skia是个2D向量图形处理函数库，包含字型、坐标转换，以及点阵图都有高效能且简洁的表现"           # 开源软件功能描述
+    },
+    {
+        "Name": "skia",                   # 上游开源软件名全称
+        "License":"PublicDomainLicense"     # 上游开源软件中包含的许可证信息
+        "License File": "LICENSE"       # 许可证所在文件路径
+        "Version Number": "f85ab491eb97b54d0bfeac19fed27feb499b8912",
+        "Upstream URL": "https://skia.googlesource.com/skia.git@f85ab491eb97b54d0bfeac19fed27feb499b8912",   # 上游软件包发布地址
+        "Description": "skia是个2D向量图形处理函数库，包含字型、坐标转换，以及点阵图都有高效能且简洁的表现"           # 开源软件功能描述
+    },
+    {
+        "Name": "skia",                   # 上游开源软件名全称
+        "License": "FTL"    # 上游开源软件中包含的许可证信息
+        "License File": "LICENSE"       # 许可证所在文件路径
+        "Version Number": "f85ab491eb97b54d0bfeac19fed27feb499b8912",
+        "Upstream URL": "https://skia.googlesource.com/skia.git@f85ab491eb97b54d0bfeac19fed27feb499b8912",   # 上游软件包发布地址
+        "Description": "skia是个2D向量图形处理函数库，包含字型、坐标转换，以及点阵图都有高效能且简洁的表现"           # 开源软件功能描述
+    },
+    {
+        "Name": "skia",                   # 上游开源软件名全称
+        "License": "BSD-3-Clause"       # 上游开源软件中包含的许可证信息
+        "License File": "LICENSE"       # 许可证所在文件路径
+        "Version Number": "f85ab491eb97b54d0bfeac19fed27feb499b8912",
+        "Upstream URL": "https://skia.googlesource.com/skia.git@f85ab491eb97b54d0bfeac19fed27feb499b8912",   # 上游软件包发布地址
+        "Description": "skia是个2D向量图形处理函数库，包含字型、坐标转换，以及点阵图都有高效能且简洁的表现"           # 开源软件功能描述
+    },
+    {
+        "Name": "skia",                   # 上游开源软件名全称
+        "License": "Apache-2.0"       # 上游开源软件中包含的许可证信息
         "License File": "LICENSE"       # 许可证所在文件路径
         "Version Number": "f85ab491eb97b54d0bfeac19fed27feb499b8912",
         "Upstream URL": "https://skia.googlesource.com/skia.git@f85ab491eb97b54d0bfeac19fed27feb499b8912",   # 上游软件包发布地址