commit 53222f5d3df88f4c4639c5ef392244ed15961f07
author Steven Moreland <smoreland@google.com> Fri Jun 16 01:34:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 16 01:34:23 2017 +0000
tree 4dc212b146b161e8e68392227f99b1e9be95e6a5
parent 425fb9aa5eb6ed8c478d15fb8f4cf2d8c42ccb48
parent ed4665aefccb57a34b5d5c810dba04eb2d6694d9

Merge "Move librilutils to vendor." am: fdbf7cd9f5
am: ed4665aefc

Change-Id: Id29bca8809bc4848b5386dafea9e7b3210e9d2b5

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index ffa18d5..cca8c69 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -52,3 +52,5 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/rild.rc)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libril.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libril.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/librilutils.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/librilutils.so)

librilutils/Android.mk

diff --git a/librilutils/Android.mk b/librilutils/Android.mk
index 455f9bc..0c6e9ea 100644
--- a/librilutils/Android.mk
+++ b/librilutils/Android.mk
@@ -17,6 +17,7 @@
 LOCAL_PROTOC_OPTIMIZE_TYPE := nanopb-c-enable_malloc
 
 LOCAL_MODULE:= librilutils
+LOCAL_VENDOR_MODULE:= true
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -39,6 +40,7 @@
 LOCAL_PROTOC_OPTIMIZE_TYPE := nanopb-c-enable_malloc
 
 LOCAL_MODULE:= librilutils_static
+LOCAL_VENDOR_MODULE:= true
 
 include $(BUILD_STATIC_LIBRARY)
 

reference-ril/Android.mk

diff --git a/reference-ril/Android.mk b/reference-ril/Android.mk
index d9908c1..6919a86 100644
--- a/reference-ril/Android.mk
+++ b/reference-ril/Android.mk
@@ -45,3 +45,5 @@
   LOCAL_MODULE:= reference-ril
   include $(BUILD_EXECUTABLE)
 endif
+
+LOCAL_VENDOR_MODULE:= true