commit 4b4992e237d027da9dc6d512b17893c6fdde05b7
author Jorge Betancourt <jmbetancourt@google.com> Mon Jan 23 17:02:04 2023 -0500
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Jan 24 20:19:25 2023 +0000
tree 4fc57a68e1ea8ab154cb44820049afd951434b9e
parent f3c52d4cd9d61598fa7d1ff7d66cbd100bdde103

remove skottie from Android.bp

removing Skottie unblocks mainline module for core graphics, so we don't want to add Skottie deps to the Android build file

Change-Id: If7cc1e868658af941d12e1a374bce3213ced3031
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/632356
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Jorge Betancourt <jmbetancourt@google.com>

gn/gn_to_bp.py

diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
index 48c2240..9776900 100755
--- a/gn/gn_to_bp.py
+++ b/gn/gn_to_bp.py
@@ -266,13 +266,6 @@
         "libpiex",
         "libexpat",
         "libft2",
-        // Required by Skottie
-        "libharfbuzz_ng",
-    ],
-    // Required by Skottie
-    cflags: [
-        "-DSK_SHAPER_HARFBUZZ_AVAILABLE",
-        "-DSK_UNICODE_AVAILABLE",
     ],
     static_libs: [
         "libwebp-decode",
@@ -283,7 +276,6 @@
     target: {
       android: {
         shared_libs: [
-            "libandroidicu",
             "libheif",
             "libimage_io",
         ],
@@ -293,16 +285,6 @@
             "libjpegencoder",
         ],
       },
-      host: {
-        shared_libs: [
-            "libicui18n",
-            "libicuuc",
-        ],
-        export_shared_lib_headers: [
-            "libicui18n",
-            "libicuuc",
-        ],
-      },
       darwin: {
         host_ldlibs: [
             "-framework AppKit",
@@ -579,7 +561,6 @@
     d['skia_use_fixed_gamma_text'] = 'true'
     d['skia_enable_fontmgr_custom_empty'] = 'true'
     d['skia_use_wuffs'] = 'true'
-    d['skia_enable_skottie'] = 'true'
 
   return d
 
@@ -653,18 +634,6 @@
 srcs = android_srcs.intersection(linux_srcs).intersection(mac_srcs)
 srcs = srcs.intersection(win_srcs)
 
-if (gn_args['skia_enable_skottie']):
-  # Skottie sits on top of skia, so we need to specify these sources to be built
-  # Python sets handle duplicate flags, source files, and includes for us
-  srcs.update(strip_slashes(js['targets']['//modules/skottie:skottie']['sources']))
-  gn_to_bp_utils.GrabDependentValues(js, '//modules/skottie:skottie', 'sources',
-                                     srcs, '//:skia')
-  srcs = strip_headers(srcs)
-
-  local_includes.update(strip_slashes(js['targets']['//modules/skottie:skottie']['include_dirs']))
-  gn_to_bp_utils.GrabDependentValues(js, '//modules/skottie:skottie', 'include_dirs',
-                                     local_includes, '//:skia')
-
 android_srcs    = android_srcs.difference(srcs)
 linux_srcs      =   linux_srcs.difference(srcs)
 mac_srcs        =     mac_srcs.difference(srcs)