merge in pi-release history after reset to master
diff --git a/rild/Android.mk b/rild/Android.mk
index 7ac505c..57a9d48 100644
--- a/rild/Android.mk
+++ b/rild/Android.mk
@@ -1,5 +1,7 @@
 # Copyright 2006 The Android Open Source Project
 
+ifndef ENABLE_VENDOR_RIL_SERVICE
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -31,3 +33,4 @@
 
 include $(BUILD_EXECUTABLE)
 
+endif