gps: Cleanup makefiles

* Bring in line with other 8916 device trees * Remove build guard, already checked in top Android.mk Change-Id: I9adb6b5be736ea4668e8c580c2ca15c895cc7e76
LLuviaDevices · Jun 17, 2016 · ed1121b · ed1121b
1 parent eac8ddc
commit ed1121b
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 160 deletions.
diff --git a/gps/Android.mk b/gps/Android.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 The CyanogenMod Project
+# Copyright (C) 2016 The CyanogenMod Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,4 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),tomato)
 include $(call all-subdir-makefiles,$(LOCAL_PATH))
-endif
diff --git a/gps/CleanSpec.mk b/gps/CleanSpec.mk
diff --git a/gps/Makefile.am b/gps/Makefile.am
diff --git a/gps/configure.ac b/gps/configure.ac
diff --git a/gps/loc-api.pc.in b/gps/loc-api.pc.in
diff --git a/gps/loc_api/libloc_api_50001/Android.mk b/gps/loc_api/libloc_api_50001/Android.mk
@@ -45,7 +45,7 @@ endif
 LOCAL_C_INCLUDES:= \
     $(TARGET_OUT_HEADERS)/gps.utils \
     $(TARGET_OUT_HEADERS)/libloc_core \
-    $(call project-path-for,qcom-gps)/loc_api/libloc_api_50001 \
+    $(LOCAL_PATH) \
     $(TARGET_OUT_HEADERS)/libflp
 
 LOCAL_COPY_HEADERS_TO:= libloc_eng/

diff --git a/gps/loc_api/loc_api_v02/Android.mk b/gps/loc_api/loc_api_v02/Android.mk
@@ -60,4 +60,4 @@ LOCAL_PRELINK_MODULE := false
 include $(BUILD_SHARED_LIBRARY)
 
 endif # not BUILD_TINY_ANDROID
-endif #QCPATH
+endif # QCPATH