diff options
author | Mike Klein <mtklein@chromium.org> | 2017-03-03 09:21:30 -0500 |
---|---|---|
committer | Mike Klein <mtklein@chromium.org> | 2017-03-03 15:41:24 +0000 |
commit | e459afd6ce2c2ccbad500dc2e77e0ac287af90eb (patch) | |
tree | c4f8fd5eb74eaefae0eb3731e3033106c8d70ae3 /third_party | |
parent | 05cb4c3e509449b0b7332ad563acfcb194b86a07 (diff) |
Strengthen is_official_build, update docs.
This makes is_official_build turn off all development targets and
features in Skia, including building third-party dependencies from
source.
This will intentionally break some external users, who will find
themselves no longer able to find third-party headers or link against
third-party libraries. These users have been building with our testing
third-party dependencies unknowingly. They'll need to either explicitly
turn back on building each dependency from source
(skia_use_system_foo=false) or disable that dependency entirely
(skia_use_foo=false).
is_skia_standalone is now basically !is_official_build, so I've
propagated that through, removing is_skia_standalone. In a few places
we were using it as a stand-in for defined(ndk), so I've just written
defined(ndk) there. Duh.
gn_to_bp:
is_offical_build's new strength also makes gn_to_bp.py simpler to
write. In spirit, Android builds are official Skia builds that also
build DM and nanobench.
It seems that SkJumper (src/jumper/*) is (unintentionally) enabled
on Android. Switching to an is_official_build would have disabled
that. But as that accidental launch seems to have gone fine, I've
kept it explicitly enabled.
In the end, no changes to Android.bp or its SkUserConfig.h.
The -Mini builder no longer needs to explicitly disable tools.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Ubuntu-Clang-x86_64-Release-Mini
Change-Id: Id06e53268a5caf55c6046ada354a0863c3031c73
Reviewed-on: https://skia-review.googlesource.com/9190
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/expat/BUILD.gn | 2 | ||||
-rw-r--r-- | third_party/freetype2/BUILD.gn | 5 | ||||
-rw-r--r-- | third_party/icu/BUILD.gn | 2 | ||||
-rw-r--r-- | third_party/jsoncpp/BUILD.gn | 2 | ||||
-rw-r--r-- | third_party/libjpeg-turbo/BUILD.gn | 2 | ||||
-rw-r--r-- | third_party/libpng/BUILD.gn | 2 | ||||
-rw-r--r-- | third_party/libwebp/BUILD.gn | 2 | ||||
-rw-r--r-- | third_party/lua/BUILD.gn | 2 | ||||
-rw-r--r-- | third_party/zlib/BUILD.gn | 2 |
9 files changed, 11 insertions, 10 deletions
diff --git a/third_party/expat/BUILD.gn b/third_party/expat/BUILD.gn index 3277389e08..d2a5d3664a 100644 --- a/third_party/expat/BUILD.gn +++ b/third_party/expat/BUILD.gn @@ -4,7 +4,7 @@ # found in the LICENSE file. declare_args() { - skia_use_system_expat = false + skia_use_system_expat = is_official_build } import("../third_party.gni") diff --git a/third_party/freetype2/BUILD.gn b/third_party/freetype2/BUILD.gn index d543dac347..7ccaa1dc96 100644 --- a/third_party/freetype2/BUILD.gn +++ b/third_party/freetype2/BUILD.gn @@ -4,8 +4,9 @@ # found in the LICENSE file. declare_args() { - # TODO: false? i.e. build from source all the time for testing? - skia_use_system_freetype2 = !(is_android || sanitize == "MSAN") + # TODO: build from source all the time for testing? + skia_use_system_freetype2 = + is_official_build || !(is_android || sanitize == "MSAN") } import("../third_party.gni") diff --git a/third_party/icu/BUILD.gn b/third_party/icu/BUILD.gn index e3815ee64f..1d54c46edd 100644 --- a/third_party/icu/BUILD.gn +++ b/third_party/icu/BUILD.gn @@ -4,7 +4,7 @@ # found in the LICENSE file. declare_args() { - skia_use_system_icu = false + skia_use_system_icu = is_official_build } import("../third_party.gni") diff --git a/third_party/jsoncpp/BUILD.gn b/third_party/jsoncpp/BUILD.gn index 34150c08b0..ff8351f2cf 100644 --- a/third_party/jsoncpp/BUILD.gn +++ b/third_party/jsoncpp/BUILD.gn @@ -4,7 +4,7 @@ # found in the LICENSE file. declare_args() { - skia_use_system_jsoncpp = false + skia_use_system_jsoncpp = is_official_build } import("../third_party.gni") diff --git a/third_party/libjpeg-turbo/BUILD.gn b/third_party/libjpeg-turbo/BUILD.gn index 6254235762..37b589d350 100644 --- a/third_party/libjpeg-turbo/BUILD.gn +++ b/third_party/libjpeg-turbo/BUILD.gn @@ -4,7 +4,7 @@ # found in the LICENSE file. declare_args() { - skia_use_system_libjpeg_turbo = false + skia_use_system_libjpeg_turbo = is_official_build } import("../third_party.gni") diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn index 3e97f5569a..6a4c65732c 100644 --- a/third_party/libpng/BUILD.gn +++ b/third_party/libpng/BUILD.gn @@ -4,7 +4,7 @@ # found in the LICENSE file. declare_args() { - skia_use_system_libpng = false + skia_use_system_libpng = is_official_build } import("../third_party.gni") diff --git a/third_party/libwebp/BUILD.gn b/third_party/libwebp/BUILD.gn index 1157e4ba3b..3e9bd06020 100644 --- a/third_party/libwebp/BUILD.gn +++ b/third_party/libwebp/BUILD.gn @@ -4,7 +4,7 @@ # found in the LICENSE file. declare_args() { - skia_use_system_libwebp = false + skia_use_system_libwebp = is_official_build } import("../third_party.gni") diff --git a/third_party/lua/BUILD.gn b/third_party/lua/BUILD.gn index 9967dcd675..14ce4175b9 100644 --- a/third_party/lua/BUILD.gn +++ b/third_party/lua/BUILD.gn @@ -4,7 +4,7 @@ # found in the LICENSE file. declare_args() { - skia_use_system_lua = false + skia_use_system_lua = is_official_build } import("../third_party.gni") diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn index e7776f5ffb..00eb327590 100644 --- a/third_party/zlib/BUILD.gn +++ b/third_party/zlib/BUILD.gn @@ -4,7 +4,7 @@ # found in the LICENSE file. declare_args() { - skia_use_system_zlib = false + skia_use_system_zlib = is_official_build } import("../third_party.gni") |