public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

CB-5447 Removed android:debuggable=“true” from project template.

Browse Source
This commit is contained in:
Andrew Grieve 2013-12-30 11:20:13 -05:00
parent 8e260d5c40
commit 942c77816d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/lib/create.js
View File

@ -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. // Returns a promise.
exports.updateProject = function(projectPath) { exports.updateProject = function(projectPath) {
var version = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8').trim(); 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(); var target_api = check_reqs.get_target();
copyJsAndLibrary(projectPath, false, null); copyJsAndLibrary(projectPath, false, null);
copyScripts(projectPath); copyScripts(projectPath);
removeDebuggableFromManifest(projectPath);
return runAndroidUpdate(projectPath, target_api, false) return runAndroidUpdate(projectPath, target_api, false)
.then(function() { .then(function() {
console.log('Android project is now at version ' + version); console.log('Android project is now at version ' + version);

3
bin/templates/project/AndroidManifest.xml
View File

@ -31,8 +31,7 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application android:icon="@drawable/icon" android:label="@string/app_name" <application android:icon="@drawable/icon" android:label="@string/app_name"
android:hardwareAccelerated="true" android:hardwareAccelerated="true">
android:debuggable="true">
<activity android:name="__ACTIVITY__" android:label="@string/app_name" <activity android:name="__ACTIVITY__" android:label="@string/app_name"
android:theme="@android:style/Theme.Black.NoTitleBar" android:theme="@android:style/Theme.Black.NoTitleBar"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"> android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale">