Merge pull request #396 from xsmile/official-build

linux_rooted: Add use-system-libraries-in-official-build.patch

resources/config_bundles/linux_rooted/patch_order.list

@@ -8,3 +8,4 @@ debian/system/event.patch
 debian/system/openjpeg.patch
 
 ungoogled-chromium/linux/disable-ffmpeg-av1-codec.patch
+ungoogled-chromium/linux/use-system-libraries-in-official-build.patch

resources/packaging/archlinux/PKGBUILD.in

@@ -93,10 +93,6 @@ prepare() {
   # Apply patches
   env QUILT_PATCHES="$_user_bundle/patches" quilt push -a
 
-  # Allow building against system libraries in official builds
-  sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-    tools/generate_shim_headers/generate_shim_headers.py
-
   # Force script incompatible with Python 3 to use /usr/bin/python2
   sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
 

resources/patches/ungoogled-chromium/linux/use-system-libraries-in-official-build.patch

@@ -0,0 +1,13 @@
+# Allow linking against system libraries when using the GN flag `is_official_build=true`
+
+--- a/tools/generate_shim_headers/generate_shim_headers.py
++++ b/tools/generate_shim_headers/generate_shim_headers.py
+@@ -18,7 +18,7 @@ import sys
+ 
+ 
+ SHIM_TEMPLATE = """
+-#if defined(OFFICIAL_BUILD)
++#if defined(GOOGLE_CHROME_BUILD)
+ #error shim headers must not be used in official builds!
+ #endif
+ """