From 904bc46a5680a3f5ba4c7327ab7dd7244b1a002a Mon Sep 17 00:00:00 2001
From: domrjchen <dom@idom.me>
Date: Thu, 30 Nov 2023 13:35:36 +0800
Subject: [PATCH] Pass the CMAKE_ANDROID_NDK env to add_custom_command.

---
 .github/workflows/build.yml | 2 +-
 DEPS                        | 4 ++--
 android/gradle.properties   | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7bbb134802..d80917bd3a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -122,7 +122,7 @@ jobs:
         run: |
           New-Item -ItemType Directory -Force -Path third_party/tgfx/out/cache
           cd android
-          ./gradlew assembleRelease -Parm64-only
+          ./gradlew assembleRelease -Parm64-only -Pandroid.native.buildOutput=verbose
 
       - name: Save Third-Party Cache
         if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }}
diff --git a/DEPS b/DEPS
index 61d883c63c5..60538091373 100644
--- a/DEPS
+++ b/DEPS
@@ -7,12 +7,12 @@
     "common": [
       {
         "url": "${PAG_GROUP}/vendor_tools.git",
-        "commit": "2250e9dadc86680ce4fb1c763b58995768040037",
+        "commit": "b5be62533c1c65f83c1b439713eb954ef3f6e2e4",
         "dir": "third_party/vendor_tools"
       },
       {
         "url": "${PAG_GROUP}/tgfx.git",
-        "commit": "079c2e27a21ed13ceba2d6b2958a4b009475b512",
+        "commit": "d9bfb8d3f6c42836e5d034a36b75226ff52b2d0f",
         "dir": "third_party/tgfx"
       },
       {
diff --git a/android/gradle.properties b/android/gradle.properties
index 6d1b80b67b4..bf72852c89f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -15,3 +15,4 @@ android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+android.native.buildOutput=verbose