From 668ed3301d5a236a183a2bd4b0231f2e936c2ddf Mon Sep 17 00:00:00 2001
From: Nullptr <52071314+Dr-TSNG@users.noreply.github.com>
Date: Sat, 2 Apr 2022 14:22:18 +0800
Subject: [PATCH] Better way to disable method inline (#1804)

---
 .github/workflows/core.yml          | 2 ++
 dex2oat/src/main/cpp/CMakeLists.txt | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 3e50c673..afab9705 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -57,6 +57,7 @@ jobs:
           ~/.ccache
           magisk-loader/build/.lto-cache
           daemon/build/.lto-cache
+          dex2oat/build/.lto-cache
         key: native-cache-${{ github.sha }}
         restore-keys: native-cache-
     - name: Install dep
@@ -125,6 +126,7 @@ jobs:
         path: |
           magisk-loader/build/symbols
           daemon/build/symbols
+          dex2oat/build/symbols
     - name: Post to channel
       if: ${{ github.event_name != 'pull_request' && success() && github.ref == 'refs/heads/master' }}
       env:
diff --git a/dex2oat/src/main/cpp/CMakeLists.txt b/dex2oat/src/main/cpp/CMakeLists.txt
index b63eaad3..ca3f0c82 100644
--- a/dex2oat/src/main/cpp/CMakeLists.txt
+++ b/dex2oat/src/main/cpp/CMakeLists.txt
@@ -1,11 +1,9 @@
 project(dex2oat)
 cmake_minimum_required(VERSION 3.4.1)
 
-add_subdirectory(${EXTERNAL_ROOT} external)
-
 add_executable(dex2oat dex2oat.c)
 
-target_link_libraries(dex2oat cxx log)
+target_link_libraries(dex2oat log)
 
 if (DEFINED DEBUG_SYMBOLS_PATH)
     message(STATUS "Debug symbols will be placed at ${DEBUG_SYMBOLS_PATH}")