Merge "Remove last use of ALL_PREBUILTS"android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-preview-2android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2

1 files changed, 15 insertions, 8 deletions

diff --git a/Android.mk b/Android.mk
index bdd1806..9d98083 100644
--- a/Android.mk
+++ b/Android.mk
@@ -106,7 +106,7 @@ LOCAL_SRC_FILES:= \
 LOCAL_CFLAGS += -Depl_LINUX -Wno-unused-parameter
 
 LOCAL_C_INCLUDES += \
-	external/neven/FaceRecEm/common/src/b_FDSDK \
+	$(LOCAL_PATH)/FaceRecEm/common/src/b_FDSDK \
 	$(JNI_H_INCLUDE) \
 	$(LOCAL_PATH)/FaceRecEm/common/src \
 	$(LOCAL_PATH)/Embedded/common/conf \
@@ -122,13 +122,20 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= libFFTEm
 
-ALL_PREBUILT += $(TARGET_OUT)/usr/share/bmd/RFFspeed_501.bmd
-$(TARGET_OUT)/usr/share/bmd/RFFspeed_501.bmd : $(LOCAL_PATH)/Embedded/common/data/APIEm/Modules/RFFspeed_501.bmd | $(ACP)
-	$(transform-prebuilt-to-target)
+LOCAL_REQUIRED_MODULES := RFFspeed_501.bmd RFFstd_501.bmd
 
-ALL_PREBUILT += $(TARGET_OUT)/usr/share/bmd/RFFstd_501.bmd
-$(TARGET_OUT)/usr/share/bmd/RFFstd_501.bmd : $(LOCAL_PATH)/Embedded/common/data/APIEm/Modules/RFFstd_501.bmd | $(ACP)
-	$(transform-prebuilt-to-target)
+include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := RFFspeed_501.bmd
+LOCAL_MODULE_CLASS := etc
+LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/bmd
+LOCAL_SRC_FILES := Embedded/common/data/APIEm/Modules/RFFspeed_501.bmd
+include $(BUILD_PREBUILT)
 
-include $(BUILD_SHARED_LIBRARY)
+include $(CLEAR_VARS)
+LOCAL_MODULE := RFFstd_501.bmd
+LOCAL_MODULE_CLASS := etc
+LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/bmd
+LOCAL_SRC_FILES := Embedded/common/data/APIEm/Modules/RFFstd_501.bmd
+include $(BUILD_PREBUILT)