From dbdc053db19a3efff1a9458cdbe53fdfb83b78c6 Mon Sep 17 00:00:00 2001 From: Kevin Li Date: Mon, 30 Mar 2020 21:29:03 +0800 Subject: [PATCH] Update ccache config (#298) --- MapboxGLAndroidSDK/build.gradle | 5 ----- gradle/native-build.gradle | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/MapboxGLAndroidSDK/build.gradle b/MapboxGLAndroidSDK/build.gradle index 06700ad8a..5ee3af61e 100644 --- a/MapboxGLAndroidSDK/build.gradle +++ b/MapboxGLAndroidSDK/build.gradle @@ -34,11 +34,6 @@ android { buildConfigField "String", "MAPBOX_VERSION_STRING", String.format("\"Mapbox/%s\"", project.VERSION_NAME) buildConfigField "String", "MAPBOX_EVENTS_USER_AGENT", String.format("\"mapbox-maps-android/%s\"", project.VERSION_NAME) consumerProguardFiles 'proguard-rules.pro' - externalNativeBuild { - cmake { - arguments '-DANDROID_CCACHE=ccache' - } - } } // build native libraries diff --git a/gradle/native-build.gradle b/gradle/native-build.gradle index 48d430fda..31813cbe2 100644 --- a/gradle/native-build.gradle +++ b/gradle/native-build.gradle @@ -44,6 +44,8 @@ ext.nativeBuild = { nativeTargets -> // Enable ccache if the user has installed it. if (file("/usr/bin/ccache").exists()) { arguments "-DANDROID_CCACHE=/usr/bin/ccache" + } else if (file("/usr/local/bin/ccache").exists()) { + arguments "-DANDROID_CCACHE=/usr/local/bin/ccache" } cFlags "-Qunused-arguments"