From a216f0db751778953224067f25b8e0077bb7e760 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Wed, 4 Jan 2017 11:48:18 -0800 Subject: [PATCH] CB-11244: Changing directory creation, will most likely hide this behind a flag for the next release of Cordova-Android, and then make it default in the next major pending feedback --- bin/lib/create.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/lib/create.js b/bin/lib/create.js index d2b2e4dc..7b329427 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -276,6 +276,7 @@ exports.create = function(project_path, config, options, events) { copyJsAndLibrary(project_path, options.link, safe_activity_name); //Set up ther Android Studio paths + var app_path = path.join(project_path, 'app', 'src', 'main'); var java_path = path.join(app_path, 'java'); var assets_path = path.join(app_path, 'assets'); var resource_path = path.join(app_path, 'res'); @@ -285,8 +286,9 @@ exports.create = function(project_path, config, options, events) { // interpolate the activity name and package var packagePath = package_name.replace(/\./g, path.sep); - var activity_dir = path.join(project_path, 'src', packagePath); + var activity_dir = path.join(java_path, packagePath); var activity_path = path.join(activity_dir, safe_activity_name + '.java'); + shell.mkdir('-p', activity_dir); shell.cp('-f', path.join(project_template_dir, 'Activity.java'), activity_path); shell.sed('-i', /__ACTIVITY__/, safe_activity_name, activity_path); @@ -298,7 +300,7 @@ exports.create = function(project_path, config, options, events) { .setTargetSdkVersion(target_api.split('-')[1]) .getActivity().setName(safe_activity_name); - var manifest_path = path.join(project_path, 'AndroidManifest.xml'); + var manifest_path = path.join(app_path, 'AndroidManifest.xml'); manifest.write(manifest_path); copyScripts(project_path);