Merge "Avoid GPS build for MSM8916 64bit"

This commit is contained in:
Linux Build Service Account 2014-04-11 00:32:08 -07:00 committed by Gerrit - the friendly Code Review server
commit 61e32edfdd
4 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,4 @@
ifeq (, $(filter aarch64 arm64, $(TARGET_ARCH)))
ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
ifneq ($(BUILD_TINY_ANDROID),true)
@ -51,3 +52,4 @@ include $(BUILD_SHARED_LIBRARY)
endif # not BUILD_TINY_ANDROID
endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE
endif # not aarch64

View file

@ -1,4 +1,4 @@
ifeq (, $(filter aarch64 arm64, $(TARGET_ARCH)))
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@ -9,4 +9,4 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/
LOCAL_SRC_FILES := gps.conf
include $(BUILD_PREBUILT)
endif # not aarch64

View file

@ -1,3 +1,4 @@
ifeq (, $(filter aarch64 arm64, $(TARGET_ARCH)))
ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
LOCAL_PATH := $(call my-dir)
@ -15,3 +16,4 @@ GPS_DIR_LIST += $(LOCAL_PATH)/libloc_api_50001/
include $(addsuffix Android.mk, $(GPS_DIR_LIST))
endif#BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE
endif # not aarch64

View file

@ -1,3 +1,4 @@
ifeq (, $(filter aarch64 arm64, $(TARGET_ARCH)))
ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
ifneq ($(BUILD_TINY_ANDROID),true)
#Compile this library only for builds with the latest modem image
@ -60,3 +61,4 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
include $(BUILD_SHARED_LIBRARY)
endif # not BUILD_TINY_ANDROID
endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE
endif # not aarch64