From 4f9d568a6cca8823bbee3b6dc6aa7b8b31c76a23 Mon Sep 17 00:00:00 2001 From: Christophe BOUCAUT Date: Tue, 10 Jul 2018 10:48:18 +0200 Subject: [PATCH] Update cordova's paths in the hook for cordova-android 7.1. --- hooks/before_compile/generateActivity.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hooks/before_compile/generateActivity.js b/hooks/before_compile/generateActivity.js index a0ddbd4..55469cb 100644 --- a/hooks/before_compile/generateActivity.js +++ b/hooks/before_compile/generateActivity.js @@ -12,8 +12,8 @@ var builder = new xml2js.Builder(); // Define differents paths. var pathConfigXml = "config.xml"; -var pathAndroidCordova = "platforms/android/"; -var pathResAndroidCordova = "platforms/android/res/"; +var pathAndroidCordova = "platforms/android/app/src/main/"; +var pathResAndroidCordova = pathAndroidCordova+"res/"; var pathAndroidPlugin = __dirname+"/../../src/android/"; var pathResAndroidPlugin = pathAndroidPlugin+"customCamera/res/"; var pathResPlugin = __dirname+"/../../res/"; @@ -42,13 +42,13 @@ var createClasses = function(packageName) { // Rewrite package of CameraActivity class. var contentCameraActivity = fs.readFileSync(pathCameraActivity, {encoding: "utf8"}); contentCameraActivity = contentCameraActivity.replace(/^package\s[^;]*/,"package "+packageName); - fs.writeFileSync(pathAndroidCordova+"src/"+generatePathFrompackageName(packageName)+"/CameraActivity.java", contentCameraActivity); + fs.writeFileSync(pathAndroidCordova+"java/"+generatePathFrompackageName(packageName)+"/CameraActivity.java", contentCameraActivity); // Rewrite import of CameraLauncher class. var contentCameraLauncher = fs.readFileSync(pathCameraLauncher, {encoding: "utf8"}); contentCameraLauncher = contentCameraLauncher.replace("XXX_NAME_CURRENT_PACKAGE_XXX", packageName); fs.writeFileSync( - pathAndroidCordova+"src/"+generatePathFrompackageName(contentCameraLauncher.match(/package\s([^;]*)/)[1])+"/CameraLauncher.java", + pathAndroidCordova+"java/"+generatePathFrompackageName(contentCameraLauncher.match(/package\s([^;]*)/)[1])+"/CameraLauncher.java", contentCameraLauncher ); } else {