diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-11-03 14:22:48 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2016-12-05 15:38:31 -0800 |
commit | 8f8836167e42a2abee815db0dbfbfa6db0181dfe (patch) | |
tree | cbcbbb300b6eda22ec84723b20f1c3ba70dae6d2 | |
parent | 93298ee273b14bb658500fa1c87286bb9ae7aabb (diff) | |
download | android_system_tools_aidl-8f8836167e42a2abee815db0dbfbfa6db0181dfe.tar.gz android_system_tools_aidl-8f8836167e42a2abee815db0dbfbfa6db0181dfe.tar.bz2 android_system_tools_aidl-8f8836167e42a2abee815db0dbfbfa6db0181dfe.zip |
Convert aidl cpp tests to Soong
Soong now has aidl-cpp support.
Test: mmma -j system/tools/aidl
Test: system/tools/aidl/runtests.sh
Change-Id: I04a880fd854376263a212e2f0f13ab798a518732
-rw-r--r-- | Android.bp | 53 | ||||
-rw-r--r-- | Android.mk | 49 |
2 files changed, 53 insertions, 49 deletions
@@ -154,3 +154,56 @@ cc_binary { "-Wunused-parameter", ], } + +cc_defaults { + name: "aidl_test_defaults", + cflags: [ + "-Wall", + "-Wextra", + "-Werror", + "-Wunused-parameter", + ], + shared_libs: [ + "libbase", + "libbinder", + "liblog", + "libutils", + ], +} + +cc_library_shared { + name: "libaidl-integration-test", + defaults: ["aidl_test_defaults"], + aidl: { + export_aidl_headers: true, + local_include_dirs: ["tests"], + include_dirs: ["frameworks/native/aidl/binder"], + }, + srcs: [ + "tests/android/aidl/tests/ITestService.aidl", + "tests/android/aidl/tests/INamedCallback.aidl", + "tests/simple_parcelable.cpp", + ], +} + +cc_binary { + name: "aidl_test_service", + defaults: ["aidl_test_defaults"], + shared_libs: ["libaidl-integration-test"], + srcs: ["tests/aidl_test_service.cpp"], +} + +cc_binary { + name: "aidl_test_client", + defaults: ["aidl_test_defaults"], + shared_libs: ["libaidl-integration-test"], + srcs: [ + "tests/aidl_test_client.cpp", + "tests/aidl_test_client_file_descriptors.cpp", + "tests/aidl_test_client_parcelables.cpp", + "tests/aidl_test_client_nullables.cpp", + "tests/aidl_test_client_primitives.cpp", + "tests/aidl_test_client_utf8_strings.cpp", + "tests/aidl_test_client_service_exceptions.cpp", + ], +} @@ -16,58 +16,9 @@ LOCAL_PATH := $(call my-dir) -aidl_cflags := -Wall -Wextra -Werror - # # Everything below here is used for integration testing of generated AIDL code. # -aidl_integration_test_cflags := $(aidl_cflags) -Wunused-parameter -aidl_integration_test_shared_libs := \ - libbase \ - libbinder \ - liblog \ - libutils - -include $(CLEAR_VARS) -LOCAL_MODULE := libaidl-integration-test -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_CFLAGS := $(aidl_integration_test_cflags) -LOCAL_SHARED_LIBRARIES := $(aidl_integration_test_shared_libs) -LOCAL_AIDL_INCLUDES := \ - system/tools/aidl/tests/ \ - frameworks/native/aidl/binder -LOCAL_SRC_FILES := \ - tests/android/aidl/tests/ITestService.aidl \ - tests/android/aidl/tests/INamedCallback.aidl \ - tests/simple_parcelable.cpp -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := aidl_test_service -LOCAL_CFLAGS := $(aidl_integration_test_cflags) -LOCAL_SHARED_LIBRARIES := \ - libaidl-integration-test \ - $(aidl_integration_test_shared_libs) -LOCAL_SRC_FILES := \ - tests/aidl_test_service.cpp -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) -LOCAL_MODULE := aidl_test_client -LOCAL_CFLAGS := $(aidl_integration_test_cflags) -LOCAL_SHARED_LIBRARIES := \ - libaidl-integration-test \ - $(aidl_integration_test_shared_libs) -LOCAL_SRC_FILES := \ - tests/aidl_test_client.cpp \ - tests/aidl_test_client_file_descriptors.cpp \ - tests/aidl_test_client_parcelables.cpp \ - tests/aidl_test_client_nullables.cpp \ - tests/aidl_test_client_primitives.cpp \ - tests/aidl_test_client_utf8_strings.cpp \ - tests/aidl_test_client_service_exceptions.cpp -include $(BUILD_EXECUTABLE) - # aidl on its own doesn't need the framework, but testing native/java # compatibility introduces java dependencies. |