Merge "Remove windows:enabled from skia_deps" am: a7b0f84a0c am: 158b270e10 am: 12ff40b750
Original change: https://android-review.googlesource.com/c/platform/external/skia/+/1495316
Change-Id: I3dd09b145927f7b26cfacb1ebe058dfe14efc0b7
diff --git a/Android.bp b/Android.bp
index bc9c6ab..d6e82d5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,8 @@
// This file is autogenerated by gn_to_bp.py.
+// To make changes to this file, follow the instructions on skia.org for
+// downloading Skia and submitting changes. Modify gn_to_bp.py (or the build
+// files it uses) and submit. The autoroller will then create the updated
+// Android.bp. Or ask a Skia engineer for help.
cc_library_static {
name: "libskia",
@@ -901,6 +905,7 @@
],
},
windows: {
+ enabled: true,
cflags: [
"-mssse3",
"-Wno-unknown-pragmas",
@@ -998,7 +1003,6 @@
],
},
windows: {
- enabled: true,
host_ldlibs: [
"-lgdi32",
"-loleaut32",
@@ -1025,6 +1029,11 @@
"-Wno-unused-parameter",
"-Wno-unused-variable",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
cc_test {
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
index 353f643..a0b6234 100755
--- a/gn/gn_to_bp.py
+++ b/gn/gn_to_bp.py
@@ -18,6 +18,10 @@
# First we start off with a template for Android.bp,
# with holes for source lists and include directories.
bp = string.Template('''// This file is autogenerated by gn_to_bp.py.
+// To make changes to this file, follow the instructions on skia.org for
+// downloading Skia and submitting changes. Modify gn_to_bp.py (or the build
+// files it uses) and submit. The autoroller will then create the updated
+// Android.bp. Or ask a Skia engineer for help.
cc_library_static {
name: "libskia",
@@ -129,6 +133,7 @@
],
},
windows: {
+ enabled: true,
cflags: [
"-mssse3",
"-Wno-unknown-pragmas",
@@ -221,7 +226,6 @@
],
},
windows: {
- enabled: true,
host_ldlibs: [
"-lgdi32",
"-loleaut32",
@@ -248,6 +252,11 @@
"-Wno-unused-parameter",
"-Wno-unused-variable",
],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
cc_test {
