diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile index 0f11d3192..c5af95ead 100644 --- a/naiveproxy/Makefile +++ b/naiveproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=naiveproxy -PKG_VERSION:=106.0.5249.91-2 +PKG_VERSION:=107.0.5304.87-1 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=beecb60b13b30e6e9fedba33604ae1e578fd56ba792f30c61179f0f02a3a9b44 +PKG_HASH:=f97f0ad880e5a784bd3fa5dd5d114434ab7e393736d90a902c0d2d3ec95e9ff0 PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE @@ -36,24 +36,13 @@ endif include $(INCLUDE_DIR)/package.mk -define Package/naiveproxy/Default - URL:=https://github.com/klzgrad/naiveproxy - DEPENDS:=@!(arc||armeb||mips||mips64||powerpc||TARGET_gemini) +libatomic -endef - define Package/naiveproxy - $(call Package/naiveproxy/Default) SECTION:=net CATEGORY:=Network SUBMENU:=Web Servers/Proxies TITLE:=Make a fortune quietly -endef - -define Package/libcronet - $(call Package/naiveproxy/Default) - SECTION:=libs - CATEGORY:=Libraries - TITLE:=The Chromium network stack library + URL:=https://github.com/klzgrad/naiveproxy + DEPENDS:=@!(arc||armeb||mips||mips64||powerpc||TARGET_gemini) +libatomic endef define Package/naiveproxy/description @@ -62,13 +51,6 @@ define Package/naiveproxy/description ensures best practices in performance and security. endef -define Package/libcronet/description - Cronet is the Chromium network stack made available to Android apps as a library. - - Cronet takes advantage of multiple technologies that reduce the latency and - increase the throughput of the network requests that your app needs to work. -endef - ifneq ($(CONFIG_CCACHE),) export CCACHE_SLOPPINESS=time_macros export CCACHE_BASEDIR=$(PKG_BUILD_DIR)/src @@ -76,44 +58,46 @@ ifneq ($(CONFIG_CCACHE),) export naive_ccache_flags=cc_wrapper="$(CCACHE)" endif -CLANG_VER:=16-init-907-g8b740747-1 +CLANG_VER:=16-init-4609-g025a5b22-2 CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz define Download/CLANG URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64 URL_FILE:=$(CLANG_FILE) FILE:=$(CLANG_FILE) - HASH:=fc874a199fcb217e246c70a8280f959ad1bfed5de27ab25877421e8588237194 + HASH:=bbcf6a3456cb6d8648a6bb15fca27bcb77902318090d2eee6cbc9472acc0ef69 endef -GN_VER:=0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a +GN_VER:=fff29c1b3f9703ea449f720fe70fa73575ef24e5 GN_FILE:=gn-git_revision-$(GN_VER).zip define Download/GN_TOOL URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+ URL_FILE:=git_revision:$(GN_VER) FILE:=$(GN_FILE) - HASH:=b8bd7e136e3fefe8be27b60f8492a0c7648337a7796b538d310c0dbd0b36a82f + HASH:=3fa137a6a090f5ac69593de6b19f8bfe6115e2383f15b6394509d431eea3cb5b endef -PGO_VER:=5249-1664382991-4c3563c0a634429d8d381274051e58611ae6cfe3 +PGO_VER:=5304-1666778341-6952d9583ad8c5425ae6677daa28778c2175311f PGO_FILE:=chrome-linux-$(PGO_VER).profdata define Download/PGO_PROF URL:=https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles URL_FILE:=$(PGO_FILE) FILE:=$(PGO_FILE) - HASH:=91cca2a7922040625c4fdb18db6035a2ffbf59b737bd1706966f1e4da06b468d + HASH:=7ac8186cec385515c6164dbfe05b05e4c6c2b25b5733e2d6b2c932670b2bd6cf endef define Build/Prepare $(call Build/Prepare/Default) ( \ - cd $(PKG_BUILD_DIR)/src ; \ + pushd $(PKG_BUILD_DIR)/src ; \ mkdir -p "chrome/build/pgo_profiles" ; \ $(CP) "$(DL_DIR)/$(PGO_FILE)" "chrome/build/pgo_profiles" ; \ mkdir -p "third_party/llvm-build/Release+Asserts" ; \ $(TAR) -xzf "$(DL_DIR)/$(CLANG_FILE)" -C "third_party/llvm-build/Release+Asserts" ; \ + echo -e "llvmorg-$(CLANG_VER)" > "third_party/llvm-build/Release+Asserts/cr_build_revision" ; \ mkdir -p "gn/out" ; \ unzip -o "$(DL_DIR)/$(GN_FILE)" -d "gn/out" ; \ + popd ; \ ) endef @@ -129,20 +113,7 @@ define Build/Configure endef define Build/Compile - $(if $(CONFIG_PACKAGE_naiveproxy), \ - +$(NINJA) -C "$(PKG_BUILD_DIR)/src/out/Release" naive) - $(if $(CONFIG_PACKAGE_libcronet), \ - +$(NINJA) -C "$(PKG_BUILD_DIR)/src/out/Release" cronet) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/libcronet - $(CP) \ - $(PKG_BUILD_DIR)/src/components/grpc_support/include/bidirectional_stream_c.h \ - $(PKG_BUILD_DIR)/src/components/cronet/native/generated/cronet.idl_c.h \ - $(PKG_BUILD_DIR)/src/components/cronet/native/include/cronet_c.h \ - $(PKG_BUILD_DIR)/src/components/cronet/native/include/cronet_export.h \ - $(1)/usr/include//libcronet/ + +$(NINJA) -C "$(PKG_BUILD_DIR)/src/out/Release" naive endef define Package/naiveproxy/install @@ -150,14 +121,8 @@ define Package/naiveproxy/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/out/Release/naive $(1)/usr/bin/naive endef -define Package/libcronet/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/src/out/Release/libcronet.so $(1)/usr/lib/ -endef - $(eval $(call Download,CLANG)) $(eval $(call Download,GN_TOOL)) $(eval $(call Download,PGO_PROF)) $(eval $(call BuildPackage,naiveproxy)) -$(eval $(call BuildPackage,libcronet)) diff --git a/naiveproxy/src/init_env.sh b/naiveproxy/src/init_env.sh index 0e666d289..1392458d5 100755 --- a/naiveproxy/src/init_env.sh +++ b/naiveproxy/src/init_env.sh @@ -40,7 +40,7 @@ export naive_flags=" is_official_build=true exclude_unwind_tables=true enable_resource_allowlist_generation=false -symbol_level=0 +symbol_level=1 is_clang=true use_sysroot=false @@ -92,7 +92,7 @@ case "${target_arch}" in esac ;; "mipsel"|"mips64el") - naive_flags+=" use_gold=false use_thin_lto=false use_lld=false chrome_pgo_phase=0 mips_arch_variant=\"r2\"" - [ "${target_arch}" == "mipsel" ] && naive_flags+=" mips_float_abi=\"soft\" mips_tune=\"${cpu_type}\"" + naive_flags+=" use_thin_lto=false chrome_pgo_phase=0 mips_arch_variant=\"r2\"" + [ "${target_arch}" == "mipsel" ] && naive_flags+=" mips_float_abi=\"soft\"" ;; esac