1 files changed, 25 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 14f2d009..19d14560 100644
--- a/Android.bp
+++ b/Android.bp
@@ -170,7 +170,7 @@ cc_defaults {
     ],
 }
 
-cc_library_shared {
+cc_library_static {
     name: "libaidl-integration-test",
     defaults: ["aidl_test_defaults"],
     aidl: {
@@ -187,14 +187,22 @@ cc_library_shared {
 cc_binary {
     name: "aidl_test_service",
     defaults: ["aidl_test_defaults"],
-    shared_libs: ["libaidl-integration-test"],
+    static_libs: [
+        "libaidl-integration-test",
+        // service uses the old version
+        "aidl-test-versioned-interface-V1-cpp",
+    ],
     srcs: ["tests/aidl_test_service.cpp"],
 }
 
 cc_binary {
     name: "aidl_test_client",
     defaults: ["aidl_test_defaults"],
-    shared_libs: ["libaidl-integration-test"],
+    static_libs: [
+        "libaidl-integration-test",
+        //  client uses the latest version
+        "aidl-test-versioned-interface-cpp",
+    ],
     srcs: [
         "tests/aidl_test_client.cpp",
         "tests/aidl_test_client_file_descriptors.cpp",
@@ -204,6 +212,7 @@ cc_binary {
         "tests/aidl_test_client_utf8_strings.cpp",
         "tests/aidl_test_client_service_exceptions.cpp",
         "tests/aidl_test_client_defaultimpl.cpp",
+        "tests/aidl_test_client_versioned_interface.cpp",
     ],
 }
 
@@ -266,3 +275,16 @@ aidl_interface {
         },
     },
 }
+
+aidl_interface {
+    name: "aidl-test-versioned-interface",
+    local_include_dir: "tests/versioned",
+    srcs: [
+        "tests/versioned/**/*.aidl",
+    ],
+    versions: [
+        "1",
+        "2",
+    ],
+    api_dir: "aidl_api/aidl-test-versioned-interface",
+}