From ddb9fe1177097b94860085954aa30a53682c8047 Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 15 Mar 2019 13:39:00 -0700 Subject: Follow frameworks_intermediates change in gradle Change directory of framework intermediates prebuilts based off recent change in location. Test: Build from IDE Change-Id: Icda11ca1526a12cc72be65052c5b1ce8c342c059 --- build.gradle | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 15a35133e..e296455be 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,9 @@ buildscript { } } +final String ANDROID_TOP = "${rootDir}/../../.." +final String FRAMEWORK_PREBUILTS_DIR = "${ANDROID_TOP}/prebuilts/framework_intermediates/" + apply plugin: 'com.android.application' apply plugin: 'com.google.protobuf' @@ -148,16 +151,16 @@ dependencies { implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}" implementation "androidx.preference:preference:${ANDROID_X_VERSION}" implementation project(':IconLoader') - implementation fileTree(dir: "libs", include: 'launcher_protos.jar') + implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'launcher_protos.jar') // Recents lib dependency - withQuickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar') + withQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/quickstep/libs", include: 'sysui_shared.jar') // Recents lib dependency for Go - withQuickstepIconRecentsImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar') + withQuickstepIconRecentsImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/quickstep/libs", include: 'sysui_shared.jar') // Required for AOSP to compile. This is already included in the sysui_shared.jar - withoutQuickstepImplementation fileTree(dir: "libs", include: 'plugin_core.jar') + withoutQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'plugin_core.jar') testImplementation 'junit:junit:4.12' androidTestImplementation "org.mockito:mockito-core:1.9.5" -- cgit v1.2.3