From a226fc5ec018aba945b4a3d90654232b0b9842d3 Mon Sep 17 00:00:00 2001 From: Subash Abhinov Kasiviswanathan Date: Fri, 30 Aug 2019 17:00:06 -0700 Subject: [PATCH] librmnetctl: disable if QMAA flag is set Disable compilation of librmnetctl and rmnetcli if the flag TARGET_USES_QMAA is set. Change-Id: I21f4e0d07b1bcc3117abd417c11c0adf0ee935df --- rmnetctl/cli/Android.mk | 9 +++++++++ rmnetctl/src/Android.mk | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/rmnetctl/cli/Android.mk b/rmnetctl/cli/Android.mk index 75cacb7..258e464 100644 --- a/rmnetctl/cli/Android.mk +++ b/rmnetctl/cli/Android.mk @@ -1,3 +1,11 @@ +TARGET_DISABLE_RMNT := false +ifeq ($(TARGET_USES_QMAA),true) +ifneq ($(TARGET_USES_QMAA_OVERRIDE_DATA),true) +TARGET_DISABLE_RMNT := true +endif +endif +ifneq ($(TARGET_DISABLE_RMNT),true) + LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -17,3 +25,4 @@ LOCAL_SHARED_LIBRARIES := librmnetctl LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin include $(BUILD_EXECUTABLE) +endif diff --git a/rmnetctl/src/Android.mk b/rmnetctl/src/Android.mk index f992aed..608c6fd 100644 --- a/rmnetctl/src/Android.mk +++ b/rmnetctl/src/Android.mk @@ -1,3 +1,11 @@ +TARGET_DISABLE_RMNT := false +ifeq ($(TARGET_USES_QMAA),true) +ifneq ($(TARGET_USES_QMAA_OVERRIDE_DATA),true) +TARGET_DISABLE_RMNT := true +endif +endif +ifneq ($(TARGET_DISABLE_RMNT),true) + LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -21,3 +29,4 @@ LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 include $(BUILD_SHARED_LIBRARY) +endif