commit | 557a53b2d316507a14857414a6e55bed40da7458 | [log] [tgz] |
---|---|---|
author | gitbuildkicker <android-build@google.com> | Mon Jan 29 14:54:47 2018 -0800 |
committer | gitbuildkicker <android-build@google.com> | Mon Jan 29 14:54:47 2018 -0800 |
tree | c80296777afb7910fdd0b9b7788b53f2380045a1 | |
parent | ab2c660d922f5072b8429528bfefa5f5965334b1 [diff] | |
parent | 8c3107ac3b3ff246c48eae4f754bc6d11b3bc7d6 [diff] |
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