Merge pull request #30674 from eliperelman/bug-1176276

Bug 1176276 - [Raptor] Ensure adb debugging is enabled

Makefile

@@ -130,7 +130,7 @@ NODE_VERSION=v0.10
 ifeq ($(DEVICE_DEBUG),1)
 REMOTE_DEBUGGER=1
 NO_LOCK_SCREEN=1
-SCREEN_TIMEOUT=300
+SCREEN_TIMEOUT?=300
 endif
 
 # We also disable FTU when running in Firefox or in debug mode
@@ -819,7 +819,7 @@ caldav-server-install:
 
 .PHONY: raptor
 raptor: node_modules
-	PERF_LOGGING=1 GAIA_OPTIMIZE=1 NO_LOCK_SCREEN=1 NOFTU=1 SCREEN_TIMEOUT=0 GAIA_DISTRIBUTION_DIR=node_modules/raptor/dist PROFILE_FOLDER=profile-raptor make reset-gaia
+	PERF_LOGGING=1 DEVICE_DEBUG=1 GAIA_OPTIMIZE=1 NOFTU=1 SCREEN_TIMEOUT=0 GAIA_DISTRIBUTION_DIR=node_modules/raptor/dist PROFILE_FOLDER=profile-raptor make reset-gaia
 
 .PHONY: tests
 tests: app offline