Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

timob-14793: change fastdev availability to emulator only #4623

Merged
merged 2 commits into from
Aug 28, 2013
Merged

timob-14793: change fastdev availability to emulator only #4623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68bf41b
timob-14793: change fastdev availability to emulator only
hieupham007 Aug 28, 2013
12b8f09
timob-14793: clean up code
hieupham007 Aug 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions android/titanium/src/java/org/appcelerator/titanium/TiApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,10 +768,17 @@ public TiDeployData getDeployData()

public boolean isFastDevMode()
{
// Fast dev is enabled by default in development mode, and disabled otherwise
// When the property is set, it overrides the default behavior
return getSystemProperties().getBool(TiApplication.PROPERTY_FASTDEV,
getDeployType().equals(TiApplication.DEPLOY_TYPE_DEVELOPMENT));
/* Fast dev is enabled by default in development mode, and disabled otherwise
* When the property is set, it overrides the default behavior on emulator only
* Deploy types are as follow:
* Emulator: 'development'
* Device: 'test'
*/
boolean development = getDeployType().equals(TiApplication.DEPLOY_TYPE_DEVELOPMENT);
if (!development) {
return false;
}
return getSystemProperties().getBool(TiApplication.PROPERTY_FASTDEV, development);
}

public boolean isCoverageEnabled()
Expand Down
2 changes: 1 addition & 1 deletion support/android/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2212,7 +2212,7 @@ def build_and_run(self, install, avd_id, keystore=None, keystore_pass='tirocks',

fastdev_property = "ti.android.fastdev"
fastdev_enabled = (self.deploy_type == 'development' and not self.build_only)
if self.tiapp.has_app_property(fastdev_property):
if self.tiapp.has_app_property(fastdev_property) and self.deploy_type == 'development':
fastdev_enabled = self.tiapp.to_bool(self.tiapp.get_app_property(fastdev_property))

if fastdev_enabled:
Expand Down