From 942c77816dd42ef88b6a298c1b7bd290cdab087b Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Mon, 30 Dec 2013 11:20:13 -0500 Subject: [PATCH] =?UTF-8?q?CB-5447=20Removed=20android:debuggable=3D?= =?UTF-8?q?=E2=80=9Ctrue=E2=80=9D=20from=20project=20template.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/lib/create.js | 7 +++++++ bin/templates/project/AndroidManifest.xml | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/lib/create.js b/bin/lib/create.js index f11b4cee..7de29429 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -187,6 +187,12 @@ exports.createProject = function(project_path, package_name, project_name, proje }); } +// Attribute removed in Cordova 4.4 (CB-5447). +function removeDebuggableFromManifest(projectPath) { + var manifestPath = path.join(projectPath, 'AndroidManifest.xml'); + shell.sed('-i', /\s*android:debuggable="true"/, '', manifestPath); +} + // Returns a promise. exports.updateProject = function(projectPath) { var version = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8').trim(); @@ -196,6 +202,7 @@ exports.updateProject = function(projectPath) { var target_api = check_reqs.get_target(); copyJsAndLibrary(projectPath, false, null); copyScripts(projectPath); + removeDebuggableFromManifest(projectPath); return runAndroidUpdate(projectPath, target_api, false) .then(function() { console.log('Android project is now at version ' + version); diff --git a/bin/templates/project/AndroidManifest.xml b/bin/templates/project/AndroidManifest.xml index f374a2e0..8a57854c 100644 --- a/bin/templates/project/AndroidManifest.xml +++ b/bin/templates/project/AndroidManifest.xml @@ -31,8 +31,7 @@ + android:hardwareAccelerated="true">