commit abc12070d01cba3dbceb4250d180cebec8fc2afc
author Nick Kralevich <nnk@google.com> Wed Jan 18 15:41:47 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 18 15:41:47 2012 -0800
tree 2699ca059d95036e9f378bb0d44aa5912e972ab8
parent 38f368c1b3bac76d342189b6412691a217421178
parent 0dbda7e1c5bcebc501b4943cd6483122297e1834

Merge "Don't read /data/local.prop on user builds"

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 162c226..d71cbc4 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -22,6 +22,10 @@
 LOCAL_CFLAGS    += -DBOOTCHART=1
 endif
 
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+LOCAL_CFLAGS += -DALLOW_LOCAL_PROP_OVERRIDE=1
+endif
+
 LOCAL_MODULE:= init
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index d06df31..0e3c25b 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -512,7 +512,9 @@
  */
 void load_persist_props(void)
 {
+#ifdef ALLOW_LOCAL_PROP_OVERRIDE
     load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE);
+#endif /* ALLOW_LOCAL_PROP_OVERRIDE */
     /* Read persistent properties after all default values have been loaded. */
     load_persistent_properties();
 }
@@ -523,7 +525,9 @@
 
     load_properties_from_file(PROP_PATH_SYSTEM_BUILD);
     load_properties_from_file(PROP_PATH_SYSTEM_DEFAULT);
+#ifdef ALLOW_LOCAL_PROP_OVERRIDE
     load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE);
+#endif /* ALLOW_LOCAL_PROP_OVERRIDE */
     /* Read persistent properties after all default values have been loaded. */
     load_persistent_properties();