diff options
| author | Roshan Pius <rpius@google.com> | 2015-11-03 13:06:54 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-04 00:52:53 +0000 |
| commit | 1b7f9fbd8934bb036991c6f93809f0f5ccbb0673 (patch) | |
| tree | 9151e699ce0b0449e9521fd351b2e84d466ad80a | |
| parent | 241e3f317fe3089dd7dcb4e7c5a34430926d4e2e (diff) | |
| download | shill-1b7f9fbd8934bb036991c6f93809f0f5ccbb0673.tar.gz | |
shill-test-proxy: Move compilation to top level Makefile.
Move the compilation of the test proxy to the top level Shill's
makefile and remove the existing makefile.
BUG: 25453106
TEST: `m -j32 && adb reboot bootloader && provision && fastboot reboot
&& adb wait-for-device && adb shell /system/bin/shill-test-rpc-proxy
--port=6756` on edison.
Change-Id: I503e567665e9af553acc0fb6cb828307bde46d9b
| -rw-r--r-- | Android.mk | 20 | ||||
| -rw-r--r-- | test-rpc-proxy/Android.mk | 39 |
2 files changed, 20 insertions, 39 deletions
@@ -587,3 +587,23 @@ LOCAL_PREBUILT_EXECUTABLES := \ bin/wpa_debug \ bin/ff_debug include $(BUILD_MULTI_PREBUILT) + +# test-rpc-proxy +# ======================================================== +include $(CLEAR_VARS) +LOCAL_MODULE := shill-test-rpc-proxy +LOCAL_MODULE_TAGS := eng tests +LOCAL_CPPFLAGS := $(shill_cpp_flags) +LOCAL_SHARED_LIBRARIES := \ + $(shill_shared_libraries) \ + libshill-client \ + libbrillo-dbus \ + libchrome-dbus \ + libxmlrpc++ +LOCAL_C_INCLUDES := \ + $(shill_c_includes) \ + external/cros/system_api/dbus \ + external/xmlrpcpp/src +$(eval $(shill_cpp_common)) +LOCAL_SRC_FILES := $(call all-cpp-files-under,test-rpc-proxy) +include $(BUILD_EXECUTABLE) diff --git a/test-rpc-proxy/Android.mk b/test-rpc-proxy/Android.mk deleted file mode 100644 index d25ab814..00000000 --- a/test-rpc-proxy/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -LOCAL_PATH := $(call my-dir) -ifeq ($(HOST_OS), linux) - -include $(CLEAR_VARS) -LOCAL_MODULE := shill-test-rpc-proxy - -LOCAL_CPP_EXTENSION := .cc -LOCAL_CLANG := true -LOCAL_RTTI_FLAG := -frtti -LOCAL_CPPFLAGS := \ - -Werror \ - -Wextra\ - -Wno-unused-parameter \ - -fno-strict-aliasing \ - -Woverloaded-virtual \ - -Wno-sign-promo \ - -Wno-missing-field-initializers - -LOCAL_C_INCLUDES := \ - external/cros/system_api/dbus \ - external/gtest/include \ - external/xmlrpcpp/src \ - system/connectivity \ - -LOCAL_SHARED_LIBRARIES := \ - libbrillo \ - libbrillo-dbus \ - libchrome \ - libchrome-dbus \ - libshill-client \ - libxmlrpc++ - -proxy_src_files := \ - $(wildcard $(LOCAL_PATH)/*.cc) -LOCAL_SRC_FILES := \ - $(proxy_src_files:$(LOCAL_PATH)/%=%) - -include $(BUILD_EXECUTABLE) -endif # HOST_OS == linux |