diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-03-23 15:12:29 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-03-23 15:12:29 -0700 |
| commit | 95e6c4663c640c67a69e1d2b44696753282136f8 (patch) | |
| tree | aafe2c8b5544208c79c2f2e741b911f6ffba920c | |
| parent | aa9f36dcc43c95c7b4e4bbfb861d98aff91ec0bc (diff) | |
| parent | 307435ff29e1f777214262a7416779b33f67899e (diff) | |
| download | neven-95e6c4663c640c67a69e1d2b44696753282136f8.tar.gz | |
resolve merge conflicts of 307435f to nyc-dev-plus-aospandroid-wear-o-preview-4android-wear-o-preview-3android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-mr1-preview-2android-n-mr1-preview-1android-n-iot-preview-4android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r4android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1oreo-vts-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseo-previewn-iot-preview-4
Change-Id: I4b46d9d5a9e7e8fa4fc1d65c316dc7569c96a10a
| -rw-r--r-- | Android.mk | 23 |
1 files changed, 15 insertions, 8 deletions
@@ -109,7 +109,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 \ @@ -125,15 +125,22 @@ 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) endif #TARGET_BUILD_PDK |