From 6f85cff5edd70b201a96b8e589f4dc3c1c3ec147 Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Wed, 23 Jan 2019 20:50:17 -0800 Subject: DO NOT MERGE: Revert "Add libprocessgroup dependency" This reverts commit 92748935c6ecbc2f0cbb4447dc26034eefcb4dac. Reason for revert: Broke AOSP Change-Id: I8cedfa5f07812c8d8e9a98ca7e139f7a4b31abe2 Signed-off-by: Suren Baghdasaryan --- core/Android.mk | 3 +-- loc_api/libloc_api_50001/Android.mk | 6 ++---- msm8084/core/Android.mk | 3 +-- msm8084/loc_api/libloc_api_50001/Android.mk | 6 ++---- msm8909/loc_api/libloc_api_50001/Android.mk | 6 ++---- msm8909/utils/Android.mk | 3 +-- msm8909w_3100/utils/Android.mk | 3 +-- .../utils/platform_lib_abstractions/loc_pla/src/Android.mk | 3 +-- msm8960/core/Android.mk | 3 +-- msm8960/loc_api/libloc_api_50001/Android.mk | 6 ++---- msm8994/core/Android.mk | 3 +-- msm8994/loc_api/libloc_api_50001/Android.mk | 6 ++---- msm8996/loc_api/libloc_api_50001/Android.mk | 6 ++---- msm8996/utils/Android.mk | 3 +-- msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk | 3 +-- 15 files changed, 21 insertions(+), 42 deletions(-) diff --git a/core/Android.mk b/core/Android.mk index 49224b1..fca66b4 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -20,8 +20,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ libgps.utils \ - libdl \ - libprocessgroup + libdl LOCAL_SRC_FILES += \ MsgTask.cpp \ diff --git a/loc_api/libloc_api_50001/Android.mk b/loc_api/libloc_api_50001/Android.mk index 97f7331..0ebf6bb 100644 --- a/loc_api/libloc_api_50001/Android.mk +++ b/loc_api/libloc_api_50001/Android.mk @@ -16,8 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ liblog \ libloc_core \ - libgps.utils \ - libprocessgroup + libgps.utils LOCAL_SRC_FILES += \ loc_eng.cpp \ @@ -76,8 +75,7 @@ LOCAL_SHARED_LIBRARIES := \ libloc_eng \ libloc_core \ libgps.utils \ - libdl \ - libprocessgroup + libdl ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false) endif diff --git a/msm8084/core/Android.mk b/msm8084/core/Android.mk index 2321745..19f6cad 100644 --- a/msm8084/core/Android.mk +++ b/msm8084/core/Android.mk @@ -15,8 +15,7 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libcutils \ libgps.utils \ - libdl \ - libprocessgroup + libdl LOCAL_SRC_FILES += \ MsgTask.cpp \ diff --git a/msm8084/loc_api/libloc_api_50001/Android.mk b/msm8084/loc_api/libloc_api_50001/Android.mk index 674383f..acb4f4f 100644 --- a/msm8084/loc_api/libloc_api_50001/Android.mk +++ b/msm8084/loc_api/libloc_api_50001/Android.mk @@ -16,8 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ liblog \ libloc_core \ - libgps.utils \ - libprocessgroup + libgps.utils LOCAL_SRC_FILES += \ loc_eng.cpp \ @@ -76,8 +75,7 @@ LOCAL_SHARED_LIBRARIES := \ libloc_eng \ libloc_core \ libgps.utils \ - libdl \ - libprocessgroup + libdl LOCAL_SRC_FILES += \ loc.cpp \ diff --git a/msm8909/loc_api/libloc_api_50001/Android.mk b/msm8909/loc_api/libloc_api_50001/Android.mk index ef9accb..3bc9b4c 100644 --- a/msm8909/loc_api/libloc_api_50001/Android.mk +++ b/msm8909/loc_api/libloc_api_50001/Android.mk @@ -16,8 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ liblog \ libloc_core \ - libgps.utils \ - libprocessgroup + libgps.utils LOCAL_SRC_FILES += \ loc_eng.cpp \ @@ -77,8 +76,7 @@ LOCAL_SHARED_LIBRARIES := \ libloc_eng \ libloc_core \ libgps.utils \ - libdl \ - libprocessgroup + libdl ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false) endif diff --git a/msm8909/utils/Android.mk b/msm8909/utils/Android.mk index 0f9b05f..2ef9bf0 100644 --- a/msm8909/utils/Android.mk +++ b/msm8909/utils/Android.mk @@ -10,8 +10,7 @@ include $(CLEAR_VARS) LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ - liblog \ - libprocessgroup + liblog LOCAL_SRC_FILES += \ loc_log.cpp \ diff --git a/msm8909w_3100/utils/Android.mk b/msm8909w_3100/utils/Android.mk index 5cd4c1b..637f154 100644 --- a/msm8909w_3100/utils/Android.mk +++ b/msm8909w_3100/utils/Android.mk @@ -12,8 +12,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ liblog \ - libloc_pla \ - libprocessgroup + libloc_pla LOCAL_SRC_FILES += \ loc_log.cpp \ diff --git a/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk index 82016a5..ab13717 100644 --- a/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk +++ b/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk @@ -29,8 +29,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ liblog \ - libloc_stub \ - libprocessgroup + libloc_stub LOCAL_SRC_FILES += \ platform_lib_gettid.cpp \ diff --git a/msm8960/core/Android.mk b/msm8960/core/Android.mk index b32d589..46b09c8 100644 --- a/msm8960/core/Android.mk +++ b/msm8960/core/Android.mk @@ -12,8 +12,7 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libcutils \ libgps.utils \ - libdl \ - libprocessgroup + libdl LOCAL_SRC_FILES += \ MsgTask.cpp \ diff --git a/msm8960/loc_api/libloc_api_50001/Android.mk b/msm8960/loc_api/libloc_api_50001/Android.mk index d8f1b0d..fe35293 100644 --- a/msm8960/loc_api/libloc_api_50001/Android.mk +++ b/msm8960/loc_api/libloc_api_50001/Android.mk @@ -16,8 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ liblog \ libloc_core \ - libgps.utils \ - libprocessgroup + libgps.utils LOCAL_SRC_FILES += \ loc_eng.cpp \ @@ -76,8 +75,7 @@ LOCAL_SHARED_LIBRARIES := \ libloc_eng \ libloc_core \ libgps.utils \ - libdl \ - libprocessgroup + libdl LOCAL_SRC_FILES += \ loc.cpp \ diff --git a/msm8994/core/Android.mk b/msm8994/core/Android.mk index 9758c6f..51a8cfb 100644 --- a/msm8994/core/Android.mk +++ b/msm8994/core/Android.mk @@ -21,8 +21,7 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libcutils \ libgps.utils \ - libdl \ - libprocessgroup + libdl LOCAL_SRC_FILES += \ MsgTask.cpp \ diff --git a/msm8994/loc_api/libloc_api_50001/Android.mk b/msm8994/loc_api/libloc_api_50001/Android.mk index 97f7331..0ebf6bb 100644 --- a/msm8994/loc_api/libloc_api_50001/Android.mk +++ b/msm8994/loc_api/libloc_api_50001/Android.mk @@ -16,8 +16,7 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ liblog \ libloc_core \ - libgps.utils \ - libprocessgroup + libgps.utils LOCAL_SRC_FILES += \ loc_eng.cpp \ @@ -76,8 +75,7 @@ LOCAL_SHARED_LIBRARIES := \ libloc_eng \ libloc_core \ libgps.utils \ - libdl \ - libprocessgroup + libdl ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false) endif diff --git a/msm8996/loc_api/libloc_api_50001/Android.mk b/msm8996/loc_api/libloc_api_50001/Android.mk index 3c23636..63204da 100644 --- a/msm8996/loc_api/libloc_api_50001/Android.mk +++ b/msm8996/loc_api/libloc_api_50001/Android.mk @@ -17,8 +17,7 @@ LOCAL_SHARED_LIBRARIES := \ libdl \ liblog \ libloc_core \ - libgps.utils \ - libprocessgroup + libgps.utils LOCAL_SRC_FILES += \ loc_eng.cpp \ @@ -76,8 +75,7 @@ LOCAL_SHARED_LIBRARIES := \ libloc_eng \ libloc_core \ libgps.utils \ - libdl \ - libprocessgroup + libdl ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false) endif diff --git a/msm8996/utils/Android.mk b/msm8996/utils/Android.mk index e0b9b32..691d494 100644 --- a/msm8996/utils/Android.mk +++ b/msm8996/utils/Android.mk @@ -10,8 +10,7 @@ include $(CLEAR_VARS) LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ - liblog \ - libprocessgroup + liblog LOCAL_HEADER_LIBRARIES := \ libhardware_headers diff --git a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk index 2eb7b1b..87d5a1e 100644 --- a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk +++ b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk @@ -11,8 +11,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ liblog \ - libloc_stub \ - libprocessgroup + libloc_stub LOCAL_SRC_FILES += \ platform_lib_gettid.cpp \ -- cgit v1.2.3