You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/12/30 17:27:40 UTC
android commit: CB-5447 Removed android:debuggable=“true” from project template.
Updated Branches:
refs/heads/master 8e260d5c4 -> 942c77816
CB-5447 Removed android:debuggable=“true” from project template.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/942c7781
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/942c7781
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/942c7781
Branch: refs/heads/master
Commit: 942c77816dd42ef88b6a298c1b7bd290cdab087b
Parents: 8e260d5
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Dec 30 11:20:13 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Dec 30 11:27:17 2013 -0500
----------------------------------------------------------------------
bin/lib/create.js | 7 +++++++
bin/templates/project/AndroidManifest.xml | 3 +--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/942c7781/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index f11b4ce..7de2942 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);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/942c7781/bin/templates/project/AndroidManifest.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/AndroidManifest.xml b/bin/templates/project/AndroidManifest.xml
index f374a2e..8a57854 100644
--- a/bin/templates/project/AndroidManifest.xml
+++ b/bin/templates/project/AndroidManifest.xml
@@ -31,8 +31,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<application android:icon="@drawable/icon" android:label="@string/app_name"
- android:hardwareAccelerated="true"
- android:debuggable="true">
+ android:hardwareAccelerated="true">
<activity android:name="__ACTIVITY__" android:label="@string/app_name"
android:theme="@android:style/Theme.Black.NoTitleBar"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">