Use BUILD_PREBUILT to copy over the NOTICE file

Bug: 5358894 Change-Id: Ie6b8aaa55295b386550bddd49f753abee084766c
AOKP · Sep 30, 2011 · 0c04c00 · 0c04c00
1 parent 6ae8ce1
commit 0c04c00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CleanSpec.mk b/CleanSpec.mk
@@ -67,6 +67,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmoto_cdma_ril.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmoto_qmi_ril.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/android-info.txt)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libmoto_lte_ril.so)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

diff --git a/device.mk b/device.mk
@@ -34,7 +34,6 @@ PRODUCT_COPY_FILES += \
     device/moto/stingray/ril/libmoto_qmi_ril.so:system/lib/libmoto_qmi_ril.so \
     device/moto/stingray/ril/libmoto_nwif_ril.so:system/lib/libmoto_nwif_ril.so \
     device/moto/stingray/ril/libmoto_intfutil_ril.so:system/lib/libmoto_intfutil_ril.so \
-    device/moto/stingray/ril/libmoto_lte_ril.so:system/lib/libmoto_lte_ril.so \
     device/moto/stingray/ril/libmoto_db_ril.so:system/lib/libmoto_db_ril.so \
     device/moto/stingray/ril/libmoto_mm_ril.so:system/lib/libmoto_mm_ril.so \
     device/moto/stingray/ril/libmoto_mdmctrl.so:system/lib/libmoto_mdmctrl.so \

diff --git a/ril/Android.mk b/ril/Android.mk
@@ -1,2 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
+# Use BUILD_PREBUILT instead of PRODUCT_COPY_FILES to bring in the NOTICE file.
+include $(CLEAR_VARS)
+LOCAL_PREBUILT_LIBS := libmoto_lte_ril.so
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_MULTI_PREBUILT)