summaryrefslogtreecommitdiffstats
path: root/core/main.mk
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-02 22:54:15 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-02 22:54:15 -0800
commita9b22497534d404bf956cdcc0941e20057219a2a (patch)
tree5492688f3ba95821b3b0f13bc42c0b68c5d3f99c /core/main.mk
parent4d23ccc023c8b98eb97a7cce820aa80bff2f3522 (diff)
downloadbuild-a9b22497534d404bf956cdcc0941e20057219a2a.zip
build-a9b22497534d404bf956cdcc0941e20057219a2a.tar.gz
build-a9b22497534d404bf956cdcc0941e20057219a2a.tar.bz2
auto import from //depot/cupcake/@137055
Diffstat (limited to 'core/main.mk')
-rw-r--r--core/main.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk
index 1369944..1f3412f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -136,11 +136,17 @@ ifneq (,$(user_variant))
ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true)
WITH_DEXPREOPT := true
endif
+
+ # Disallow mock locations by default for user builds
+ ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0
+
else # !user_variant
# Turn on checkjni for non-user builds.
ADDITIONAL_BUILD_PROPERTIES += ro.kernel.android.checkjni=1
# Set device insecure for non-user builds.
ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=0
+ # Allow mock locations by default for non user builds
+ ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=1
endif # !user_variant
ifeq (true,$(strip $(enable_target_debugging)))