5ca26120 · 5ca26120
隐藏空白更改
内联并排

Showing with 76 addition and 60 deletion

BUILD.gn BUILD.gn +17 -3

OAT.xml OAT.xml +59 -57

未找到文件。
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -237,7 +237,6 @@ if (defined(ohos_lite)) {

  config("curl_config_public") {
    include_dirs = [
-      "$CURL_SOURCE_ROOT/lib",
      "$CURL_SOURCE_ROOT/include",
      "//third_party/curl/customized/include",
    ]
@@ -281,6 +280,15 @@ if (defined(ohos_lite)) {
    cflags = [ "-Wno-deprecated-declarations" ]
  }

+  config("curl_config_public") {
+    include_dirs = [
+      "$CURL_SOURCE_ROOT/include",
+      "//third_party/curl/customized/include",
+    ]
+
+    cflags = [ "-Wno-deprecated-declarations" ]
+  }
+
  ohos_source_set("curl") {
    configs = [ ":curl_config" ]
    configs += [ "//third_party/openssl:ssl_config_public" ]
@@ -416,9 +424,15 @@ if (defined(ohos_lite)) {

  ohos_shared_library("curl_shared") {
    deps = [ ":curl" ]
-    public_configs = [ ":curl_config" ]

-    install_images = [ "system" ]
+    configs = [ ":curl_config" ]
+
+    public_configs = [ ":curl_config_public" ]
+
+    install_images = [
+      "updater",
+      "system",
+    ]

    subsystem_name = "thirdparty"
    innerapi_tags = [ "platformsdk" ]

--- a/OAT.xml
+++ b/OAT.xml
@@ -53,62 +53,64 @@ Note:If the text contains special characters, please escape them according to th
 -->
 <configuration>
    <oatconfig>
-	<licensefile>COPYING</licensefile>
-	<policylist>
-	    <policy name="projectPolicy" desc="">
-		<policyitem type="compatibility" name="The curl license" path=".*" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter" desc=""/>
-		<policyitem type="compatibility" name="curl" path=".*" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter" desc=""/>
-		<policyitem type="compatibility" name="ISC License" path=".*" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter" desc=""/>
-	    </policy>
-	</policylist>
-	<licensematcherlist>
-	    <licensematcher name="The curl license" desc="If the scanning result is InvalidLicense, you can define matching rules here. Note that quotation marks must be escaped.">
-		<licensetext name="
-		    * This software is licensed as described in the file COPYING, which
-		    * you should have received as part of this distribution. The terms
-		    * are also available at https://curl.se/docs/copyright.html.
-		    *
-		    * You may opt to use, copy, modify, merge, publish, distribute and/or sell
-		    * copies of the Software, and permit persons to whom the Software is
-		    * furnished to do so, under the terms of the COPYING file.
-		    " desc=""/>
-		<licensetext name="
-		     * Permission to use, copy, modify, and distribute this software for any
-		     * purpose with or without fee is hereby granted, provided that the above
-		     * copyright notice and this permission notice appear in all copies.
-		     *
-		     * THE SOFTWARE IS PROVIDED &gt;AS IS&gt; AND INTERNET SOFTWARE CONSORTIUM
-		     * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-		     * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-		     * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-		     * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-		     * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-		     * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-		     * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-		    " desc=""/>
-	    </licensematcher>
-	</licensematcherlist>
-	<filefilterlist>
-	    <filefilter name="defaultPolicyFilter" desc="Filters for compatibility，license header policies">
-		<filteritem type="filename" name="macos_main.cpp" desc=""/>
-		<filteritem type="filename" name="test17" desc=""/>
-		<filteritem type="filename" name="*.sh" desc=""/>
-		<filteritem type="filename" name="*.bat" desc=""/>
-		<filteritem type="filename" name="*.cmd" desc=""/>
-		<filteritem type="filename" name="*.m4" desc=""/>
-		<filteritem type="filepath" name="docs/.*" desc=""/>S
-	    </filefilter>
-	    <filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies">
-	    </filefilter>
-	    <filefilter name="licenseFileNamePolicyFilter" desc="Filters for LICENSE file policies">
-	    </filefilter>
-	    <filefilter name="binaryFileTypePolicyFilter" desc="File not used">
-		<filteritem type="filepath" name="tests/.*" desc=""/>
-	    </filefilter>
-	    <filefilter name="publicCAFilePolicyFilter" desc="Filters for public CA file policies">
-		<filteritem type="filepath" name="cacert.pem" desc="This is a bundle of X.509 certificates of public
-			Certificate Authorities(CA) downloaded from https://curl.se/docs/caextract.html"/>
-	    </filefilter>
-	</filefilterlist>
+    <licensefile>COPYING</licensefile>
+    <policylist>
+        <policy name="projectPolicy" desc="">
+        <policyitem type="compatibility" name="The curl license" path=".*" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter" desc=""/>
+        <policyitem type="compatibility" name="curl" path=".*" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter" desc=""/>
+        <policyitem type="compatibility" name="ISC License" path=".*" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter" desc=""/>
+        </policy>
+    </policylist>
+    <licensematcherlist>
+        <licensematcher name="The curl license" desc="If the scanning result is InvalidLicense, you can define matching rules here. Note that quotation marks must be escaped.">
+        <licensetext name="
+            * This software is licensed as described in the file COPYING, which
+            * you should have received as part of this distribution. The terms
+            * are also available at https://curl.se/docs/copyright.html.
+            *
+            * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+            * copies of the Software, and permit persons to whom the Software is
+            * furnished to do so, under the terms of the COPYING file.
+            " desc=""/>
+        <licensetext name="
+             * Permission to use, copy, modify, and distribute this software for any
+             * purpose with or without fee is hereby granted, provided that the above
+             * copyright notice and this permission notice appear in all copies.
+             *
+             * THE SOFTWARE IS PROVIDED &gt;AS IS&gt; AND INTERNET SOFTWARE CONSORTIUM
+             * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+             * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+             * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+             * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+             * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+             * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+             * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+            " desc=""/>
+        </licensematcher>
+    </licensematcherlist>
+    <filefilterlist>
+        <filefilter name="defaultPolicyFilter" desc="Filters for compatibility，license header policies">
+            <filteritem type="filename" name="macos_main.cpp" desc=""/>
+            <filteritem type="filename" name="test17" desc=""/>
+            <filteritem type="filename" name="*.sh" desc=""/>
+            <filteritem type="filename" name="*.bat" desc=""/>
+            <filteritem type="filename" name="*.cmd" desc=""/>
+            <filteritem type="filename" name="*.m4" desc=""/>
+            <filteritem type="filepath" name="docs/.*" desc=""/>
+        </filefilter>
+        <filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies">
+        </filefilter>
+        <filefilter name="licenseFileNamePolicyFilter" desc="Filters for LICENSE file policies">
+        </filefilter>
+        <filefilter name="binaryFileTypePolicyFilter" desc="File not used">
+            <filteritem type="filepath" name="tests/.*" desc=""/>
+            <filteritem type="filepath" name="cacert.pem" desc=""/>
+            <filteritem type="filepath" name="curl-7.79.1.tar.xz" desc=""/>
+        </filefilter>
+        <filefilter name="publicCAFilePolicyFilter" desc="Filters for public CA file policies">
+            <filteritem type="filepath" name="cacert.pem" desc="This is a bundle of X.509 certificates of public
+                Certificate Authorities(CA) downloaded from https://curl.se/docs/caextract.html"/>
+        </filefilter>
+    </filefilterlist>
    </oatconfig>
 </configuration>