summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDante Russo <drusso@codeaurora.org>2014-05-07 17:12:49 -0700
committerTushar Janefalkar <tusharj@codeaurora.org>2014-06-17 11:18:48 -0700
commit9ffb10553dca42d752248dadc0c2cb9e620c916e (patch)
treec216da3f725525f269c19f42fda7cd4dae25fc54
parentc1f630ca5582d81e46ab86d747212ca7e7442dde (diff)
downloadgps-9ffb10553dca42d752248dadc0c2cb9e620c916e.tar.gz
Revert "Avoid GPS build for MSM8916 64bit"
This reverts commit 0daddfd2fd9f38cce21d604d7d981e8972557740. Change-Id: I3138bb2d600618cfec5ec7588d5359b15a07cbad
-rw-r--r--core/Android.mk2
-rw-r--r--etc/Android.mk4
-rw-r--r--loc_api/Android.mk2
-rw-r--r--utils/Android.mk2
4 files changed, 2 insertions, 8 deletions
diff --git a/core/Android.mk b/core/Android.mk
index 0d1b7c2..3e2b2eb 100644
--- a/core/Android.mk
+++ b/core/Android.mk
@@ -1,4 +1,3 @@
-ifeq (, $(filter aarch64 arm64, $(TARGET_ARCH)))
ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
ifneq ($(BUILD_TINY_ANDROID),true)
@@ -52,4 +51,3 @@ include $(BUILD_SHARED_LIBRARY)
endif # not BUILD_TINY_ANDROID
endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE
-endif # not aarch64
diff --git a/etc/Android.mk b/etc/Android.mk
index 452dcd2..025d3f7 100644
--- a/etc/Android.mk
+++ b/etc/Android.mk
@@ -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
+
diff --git a/loc_api/Android.mk b/loc_api/Android.mk
index e58f18e..743b386 100644
--- a/loc_api/Android.mk
+++ b/loc_api/Android.mk
@@ -1,4 +1,3 @@
-ifeq (, $(filter aarch64 arm64, $(TARGET_ARCH)))
ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
LOCAL_PATH := $(call my-dir)
@@ -16,4 +15,3 @@ 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
diff --git a/utils/Android.mk b/utils/Android.mk
index 82c56f6..07c1b1d 100644
--- a/utils/Android.mk
+++ b/utils/Android.mk
@@ -1,4 +1,3 @@
-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
@@ -61,4 +60,3 @@ 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