diff options
author | Sen Jiang <senj@google.com> | 2017-03-04 03:17:00 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-04 03:17:00 +0000 |
commit | 1b53b72c32007d235c83e81b14525d6302bff337 (patch) | |
tree | 0180813575d2d7035fd495457057b8725b88d75c | |
parent | 69f25ed7d17a0d9dc39223f4a91b0341d7d6e158 (diff) | |
parent | 49b343d57cdf039eaeae63d90fbf57a94977289a (diff) | |
download | platform_external_libbrillo-1b53b72c32007d235c83e81b14525d6302bff337.tar.gz platform_external_libbrillo-1b53b72c32007d235c83e81b14525d6302bff337.tar.bz2 platform_external_libbrillo-1b53b72c32007d235c83e81b14525d6302bff337.zip |
Remove DBus support in Android.mk am: 4a6857a3e1 am: 3f59c6460eandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-release
am: 49b343d57c
Change-Id: Ibe9c3fdc224f04ddffa67d4a84f1fe2c6e0c0e00
-rw-r--r-- | Android.mk | 60 |
1 files changed, 1 insertions, 59 deletions
@@ -15,7 +15,6 @@ # Default values for the USE flags. Override these USE flags from your product # by setting BRILLO_USE_* values. Note that we define local variables like # local_use_* to prevent leaking our default setting for other packages. -local_use_dbus := $(if $(BRILLO_USE_DBUS),$(BRILLO_USE_DBUS),0) LOCAL_PATH := $(call my-dir) @@ -51,21 +50,6 @@ libbrillo_linux_sources := \ libbrillo_binder_sources := \ brillo/binder_watcher.cc \ -libbrillo_dbus_sources := \ - brillo/any.cc \ - brillo/daemons/dbus_daemon.cc \ - brillo/dbus/async_event_sequencer.cc \ - brillo/dbus/data_serialization.cc \ - brillo/dbus/dbus_connection.cc \ - brillo/dbus/dbus_method_invoker.cc \ - brillo/dbus/dbus_method_response.cc \ - brillo/dbus/dbus_object.cc \ - brillo/dbus/dbus_service_watcher.cc \ - brillo/dbus/dbus_signal.cc \ - brillo/dbus/exported_object_manager.cc \ - brillo/dbus/exported_property_set.cc \ - brillo/dbus/utils.cc \ - libbrillo_http_sources := \ brillo/http/curl_api.cc \ brillo/http/http_connection_curl.cc \ @@ -132,26 +116,9 @@ libbrillo_test_sources := \ brillo/url_utils_unittest.cc \ brillo/value_conversion_unittest.cc \ -libbrillo_dbus_test_sources := \ - brillo/any_unittest.cc \ - brillo/any_internal_impl_unittest.cc \ - brillo/dbus/async_event_sequencer_unittest.cc \ - brillo/dbus/data_serialization_unittest.cc \ - brillo/dbus/dbus_method_invoker_unittest.cc \ - brillo/dbus/dbus_object_unittest.cc \ - brillo/dbus/dbus_param_reader_unittest.cc \ - brillo/dbus/dbus_param_writer_unittest.cc \ - brillo/dbus/dbus_signal_handler_unittest.cc \ - brillo/dbus/exported_object_manager_unittest.cc \ - brillo/dbus/exported_property_set_unittest.cc \ - brillo/dbus/test.proto \ - brillo/type_name_undecorate_unittest.cc \ - brillo/variant_dictionary_unittest.cc \ - libbrillo_CFLAGS := \ -Wall \ - -Werror \ - -DUSE_DBUS=$(local_use_dbus) + -Werror libbrillo_CPPFLAGS := libbrillo_includes := libbrillo_shared_libraries := libchrome @@ -190,26 +157,6 @@ LOCAL_CLANG := true LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_SHARED_LIBRARY) -ifeq ($(local_use_dbus),1) - -# Shared dbus library for target -# ======================================================== -include $(CLEAR_VARS) -LOCAL_CPP_EXTENSION := $(libbrillo_cpp_extension) -LOCAL_MODULE := libbrillo-dbus -LOCAL_SRC_FILES := $(libbrillo_dbus_sources) -LOCAL_C_INCLUDES := $(libbrillo_includes) -LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) libbrillo \ - libchrome-dbus libdbus -LOCAL_STATIC_LIBRARIES := libgtest_prod -LOCAL_CFLAGS := $(libbrillo_CFLAGS) -LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) -LOCAL_CLANG := true -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) external/dbus -include $(BUILD_SHARED_LIBRARY) - -endif # local_use_dbus == 1 - # Shared minijail library for target # ======================================================== include $(CLEAR_VARS) @@ -389,11 +336,6 @@ LOCAL_STATIC_LIBRARIES := libgtest libchrome_test_helpers \ libbrillo-test-helpers libgmock libBionicGtestMain LOCAL_SHARED_LIBRARIES := $(libbrillo_shared_libraries) libbrillo libcurl \ libbrillo-http libbrillo-stream libcrypto libprotobuf-cpp-lite -ifeq ($(local_use_dbus),1) -LOCAL_SRC_FILES += $(libbrillo_dbus_test_sources) -LOCAL_STATIC_LIBRARIES += libchrome_dbus_test_helpers -LOCAL_SHARED_LIBRARIES += libbrillo-dbus libchrome-dbus libdbus -endif # local_use_dbus == 1 LOCAL_CFLAGS := $(libbrillo_CFLAGS) LOCAL_CPPFLAGS := $(libbrillo_CPPFLAGS) -Wno-sign-compare LOCAL_CLANG := true |