From 1cb1e14faebbc1df86cd549af087a6b582687181 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 24 May 2017 15:29:56 -0700 Subject: [PATCH] Remove versioning tests interfaces. These are moved to system/tools/hidl/test in a form that can have build time tests added and which don't affect checkbuild time by adding various Java targets. Test: none Bug: 38242758 Change-Id: I747619389e667f5660cdc0bf2cccd9df6bbb8eb4 --- tests/Android.bp | 4 - tests/versioning/1.0/Android.bp | 59 ------------ tests/versioning/1.0/Android.mk | 76 ---------------- tests/versioning/1.0/IFoo.hal | 20 ---- tests/versioning/2.2/Android.bp | 66 -------------- tests/versioning/2.2/Android.mk | 114 ----------------------- tests/versioning/2.2/IBar.hal | 21 ----- tests/versioning/2.2/IFoo.hal | 21 ----- tests/versioning/2.3/Android.bp | 77 ---------------- tests/versioning/2.3/Android.mk | 156 -------------------------------- tests/versioning/2.3/IBar.hal | 24 ----- tests/versioning/2.3/IBaz.hal | 23 ----- tests/versioning/2.3/IFoo.hal | 24 ----- tests/versioning/2.4/Android.bp | 63 ------------- tests/versioning/2.4/Android.mk | 80 ---------------- tests/versioning/2.4/IFoo.hal | 24 ----- 16 files changed, 852 deletions(-) delete mode 100644 tests/versioning/1.0/Android.bp delete mode 100644 tests/versioning/1.0/Android.mk delete mode 100644 tests/versioning/1.0/IFoo.hal delete mode 100644 tests/versioning/2.2/Android.bp delete mode 100644 tests/versioning/2.2/Android.mk delete mode 100644 tests/versioning/2.2/IBar.hal delete mode 100644 tests/versioning/2.2/IFoo.hal delete mode 100644 tests/versioning/2.3/Android.bp delete mode 100644 tests/versioning/2.3/Android.mk delete mode 100644 tests/versioning/2.3/IBar.hal delete mode 100644 tests/versioning/2.3/IBaz.hal delete mode 100644 tests/versioning/2.3/IFoo.hal delete mode 100644 tests/versioning/2.4/Android.bp delete mode 100644 tests/versioning/2.4/Android.mk delete mode 100644 tests/versioning/2.4/IFoo.hal diff --git a/tests/Android.bp b/tests/Android.bp index 8e4815cf0d..7b2b2d3e38 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -22,8 +22,4 @@ subdirs = [ "pointer/1.0", "pointer/1.0/default", "pointer/1.0/default/lib", - "versioning/1.0", - "versioning/2.2", - "versioning/2.3", - "versioning/2.4", ] diff --git a/tests/versioning/1.0/Android.bp b/tests/versioning/1.0/Android.bp deleted file mode 100644 index 647e0433d8..0000000000 --- a/tests/versioning/1.0/Android.bp +++ /dev/null @@ -1,59 +0,0 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. - -filegroup { - name: "android.hardware.tests.versioning@1.0_hal", - srcs: [ - "IFoo.hal", - ], -} - -genrule { - name: "android.hardware.tests.versioning@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0", - srcs: [ - ":android.hardware.tests.versioning@1.0_hal", - ], - out: [ - "android/hardware/tests/versioning/1.0/FooAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.versioning@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0", - srcs: [ - ":android.hardware.tests.versioning@1.0_hal", - ], - out: [ - "android/hardware/tests/versioning/1.0/IFoo.h", - "android/hardware/tests/versioning/1.0/IHwFoo.h", - "android/hardware/tests/versioning/1.0/BnHwFoo.h", - "android/hardware/tests/versioning/1.0/BpHwFoo.h", - "android/hardware/tests/versioning/1.0/BsFoo.h", - ], -} - -cc_library_shared { - name: "android.hardware.tests.versioning@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.versioning@1.0_genc++"], - generated_headers: ["android.hardware.tests.versioning@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.tests.versioning@1.0_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} diff --git a/tests/versioning/1.0/Android.mk b/tests/versioning/1.0/Android.mk deleted file mode 100644 index 81ffd082b9..0000000000 --- a/tests/versioning/1.0/Android.mk +++ /dev/null @@ -1,76 +0,0 @@ -# This file is autogenerated by hidl-gen. Do not edit manually. - -LOCAL_PATH := $(call my-dir) - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning-V1.0-java -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_JAVA_LIBRARIES := \ - android.hidl.base-V1.0-java \ - - -# -# Build IFoo.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V1_0/IFoo.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@1.0::IFoo - -$(GEN): $(LOCAL_PATH)/IFoo.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning-V1.0-java-static -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base-V1.0-java-static \ - - -# -# Build IFoo.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V1_0/IFoo.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@1.0::IFoo - -$(GEN): $(LOCAL_PATH)/IFoo.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_STATIC_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/versioning/1.0/IFoo.hal b/tests/versioning/1.0/IFoo.hal deleted file mode 100644 index 0571eff208..0000000000 --- a/tests/versioning/1.0/IFoo.hal +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.tests.versioning@1.0; - -interface IFoo { -}; diff --git a/tests/versioning/2.2/Android.bp b/tests/versioning/2.2/Android.bp deleted file mode 100644 index 3a4a00322f..0000000000 --- a/tests/versioning/2.2/Android.bp +++ /dev/null @@ -1,66 +0,0 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. - -filegroup { - name: "android.hardware.tests.versioning@2.2_hal", - srcs: [ - "IBar.hal", - "IFoo.hal", - ], -} - -genrule { - name: "android.hardware.tests.versioning@2.2_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2", - srcs: [ - ":android.hardware.tests.versioning@2.2_hal", - ], - out: [ - "android/hardware/tests/versioning/2.2/BarAll.cpp", - "android/hardware/tests/versioning/2.2/FooAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.versioning@2.2_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2", - srcs: [ - ":android.hardware.tests.versioning@2.2_hal", - ], - out: [ - "android/hardware/tests/versioning/2.2/IBar.h", - "android/hardware/tests/versioning/2.2/IHwBar.h", - "android/hardware/tests/versioning/2.2/BnHwBar.h", - "android/hardware/tests/versioning/2.2/BpHwBar.h", - "android/hardware/tests/versioning/2.2/BsBar.h", - "android/hardware/tests/versioning/2.2/IFoo.h", - "android/hardware/tests/versioning/2.2/IHwFoo.h", - "android/hardware/tests/versioning/2.2/BnHwFoo.h", - "android/hardware/tests/versioning/2.2/BpHwFoo.h", - "android/hardware/tests/versioning/2.2/BsFoo.h", - ], -} - -cc_library_shared { - name: "android.hardware.tests.versioning@2.2", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.versioning@2.2_genc++"], - generated_headers: ["android.hardware.tests.versioning@2.2_genc++_headers"], - export_generated_headers: ["android.hardware.tests.versioning@2.2_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} diff --git a/tests/versioning/2.2/Android.mk b/tests/versioning/2.2/Android.mk deleted file mode 100644 index 4fccce68c7..0000000000 --- a/tests/versioning/2.2/Android.mk +++ /dev/null @@ -1,114 +0,0 @@ -# This file is autogenerated by hidl-gen. Do not edit manually. - -LOCAL_PATH := $(call my-dir) - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning-V2.2-java -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_JAVA_LIBRARIES := \ - android.hidl.base-V1.0-java \ - - -# -# Build IBar.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_2/IBar.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.2::IBar - -$(GEN): $(LOCAL_PATH)/IBar.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IFoo.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_2/IFoo.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.2::IFoo - -$(GEN): $(LOCAL_PATH)/IFoo.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning-V2.2-java-static -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base-V1.0-java-static \ - - -# -# Build IBar.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_2/IBar.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.2::IBar - -$(GEN): $(LOCAL_PATH)/IBar.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IFoo.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_2/IFoo.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.2::IFoo - -$(GEN): $(LOCAL_PATH)/IFoo.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_STATIC_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/versioning/2.2/IBar.hal b/tests/versioning/2.2/IBar.hal deleted file mode 100644 index e28ce1983f..0000000000 --- a/tests/versioning/2.2/IBar.hal +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.tests.versioning@2.2; - -interface IBar { - -}; diff --git a/tests/versioning/2.2/IFoo.hal b/tests/versioning/2.2/IFoo.hal deleted file mode 100644 index d6b87820eb..0000000000 --- a/tests/versioning/2.2/IFoo.hal +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.tests.versioning@2.2; - -interface IFoo { - -}; diff --git a/tests/versioning/2.3/Android.bp b/tests/versioning/2.3/Android.bp deleted file mode 100644 index 65e1193063..0000000000 --- a/tests/versioning/2.3/Android.bp +++ /dev/null @@ -1,77 +0,0 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. - -filegroup { - name: "android.hardware.tests.versioning@2.3_hal", - srcs: [ - "IBar.hal", - "IBaz.hal", - "IFoo.hal", - ], -} - -genrule { - name: "android.hardware.tests.versioning@2.3_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3", - srcs: [ - ":android.hardware.tests.versioning@2.3_hal", - ], - out: [ - "android/hardware/tests/versioning/2.3/BarAll.cpp", - "android/hardware/tests/versioning/2.3/BazAll.cpp", - "android/hardware/tests/versioning/2.3/FooAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.versioning@2.3_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3", - srcs: [ - ":android.hardware.tests.versioning@2.3_hal", - ], - out: [ - "android/hardware/tests/versioning/2.3/IBar.h", - "android/hardware/tests/versioning/2.3/IHwBar.h", - "android/hardware/tests/versioning/2.3/BnHwBar.h", - "android/hardware/tests/versioning/2.3/BpHwBar.h", - "android/hardware/tests/versioning/2.3/BsBar.h", - "android/hardware/tests/versioning/2.3/IBaz.h", - "android/hardware/tests/versioning/2.3/IHwBaz.h", - "android/hardware/tests/versioning/2.3/BnHwBaz.h", - "android/hardware/tests/versioning/2.3/BpHwBaz.h", - "android/hardware/tests/versioning/2.3/BsBaz.h", - "android/hardware/tests/versioning/2.3/IFoo.h", - "android/hardware/tests/versioning/2.3/IHwFoo.h", - "android/hardware/tests/versioning/2.3/BnHwFoo.h", - "android/hardware/tests/versioning/2.3/BpHwFoo.h", - "android/hardware/tests/versioning/2.3/BsFoo.h", - ], -} - -cc_library_shared { - name: "android.hardware.tests.versioning@2.3", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.versioning@2.3_genc++"], - generated_headers: ["android.hardware.tests.versioning@2.3_genc++_headers"], - export_generated_headers: ["android.hardware.tests.versioning@2.3_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.tests.versioning@1.0", - "android.hardware.tests.versioning@2.2", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.tests.versioning@1.0", - "android.hardware.tests.versioning@2.2", - ], -} diff --git a/tests/versioning/2.3/Android.mk b/tests/versioning/2.3/Android.mk deleted file mode 100644 index 36326d66e0..0000000000 --- a/tests/versioning/2.3/Android.mk +++ /dev/null @@ -1,156 +0,0 @@ -# This file is autogenerated by hidl-gen. Do not edit manually. - -LOCAL_PATH := $(call my-dir) - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning-V2.3-java -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_JAVA_LIBRARIES := \ - android.hardware.tests.versioning-V1.0-java \ - android.hardware.tests.versioning-V2.2-java \ - android.hidl.base-V1.0-java \ - - -# -# Build IBar.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IBar.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.3::IBar - -$(GEN): $(LOCAL_PATH)/IBar.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IBaz.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IBaz.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.3::IBaz - -$(GEN): $(LOCAL_PATH)/IBaz.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IFoo.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IFoo.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.3::IFoo - -$(GEN): $(LOCAL_PATH)/IFoo.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning-V2.3-java-static -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hardware.tests.versioning-V1.0-java-static \ - android.hardware.tests.versioning-V2.2-java-static \ - android.hidl.base-V1.0-java-static \ - - -# -# Build IBar.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IBar.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.3::IBar - -$(GEN): $(LOCAL_PATH)/IBar.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IBaz.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IBaz.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.3::IBaz - -$(GEN): $(LOCAL_PATH)/IBaz.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IFoo.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_3/IFoo.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.3::IFoo - -$(GEN): $(LOCAL_PATH)/IFoo.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_STATIC_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/versioning/2.3/IBar.hal b/tests/versioning/2.3/IBar.hal deleted file mode 100644 index fe38e76a54..0000000000 --- a/tests/versioning/2.3/IBar.hal +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.tests.versioning@2.3; - -import @2.2::IBar; - -// Must extend @2.2::IBar. -interface IBar extends @2.2::IBar { - -}; diff --git a/tests/versioning/2.3/IBaz.hal b/tests/versioning/2.3/IBaz.hal deleted file mode 100644 index e28792cc9d..0000000000 --- a/tests/versioning/2.3/IBaz.hal +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.tests.versioning@2.3; - -import @1.0::IFoo; - -interface IBaz extends @1.0::IFoo { - -}; diff --git a/tests/versioning/2.3/IFoo.hal b/tests/versioning/2.3/IFoo.hal deleted file mode 100644 index 2c76500d6d..0000000000 --- a/tests/versioning/2.3/IFoo.hal +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.tests.versioning@2.3; - -import @2.2::IFoo; - -// Must extend @2.2::IFoo. -interface IFoo extends @2.2::IFoo { - -}; diff --git a/tests/versioning/2.4/Android.bp b/tests/versioning/2.4/Android.bp deleted file mode 100644 index d236a1882c..0000000000 --- a/tests/versioning/2.4/Android.bp +++ /dev/null @@ -1,63 +0,0 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. - -filegroup { - name: "android.hardware.tests.versioning@2.4_hal", - srcs: [ - "IFoo.hal", - ], -} - -genrule { - name: "android.hardware.tests.versioning@2.4_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4", - srcs: [ - ":android.hardware.tests.versioning@2.4_hal", - ], - out: [ - "android/hardware/tests/versioning/2.4/FooAll.cpp", - ], -} - -genrule { - name: "android.hardware.tests.versioning@2.4_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.4", - srcs: [ - ":android.hardware.tests.versioning@2.4_hal", - ], - out: [ - "android/hardware/tests/versioning/2.4/IFoo.h", - "android/hardware/tests/versioning/2.4/IHwFoo.h", - "android/hardware/tests/versioning/2.4/BnHwFoo.h", - "android/hardware/tests/versioning/2.4/BpHwFoo.h", - "android/hardware/tests/versioning/2.4/BsFoo.h", - ], -} - -cc_library_shared { - name: "android.hardware.tests.versioning@2.4", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.tests.versioning@2.4_genc++"], - generated_headers: ["android.hardware.tests.versioning@2.4_genc++_headers"], - export_generated_headers: ["android.hardware.tests.versioning@2.4_genc++_headers"], - vendor_available: true, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.tests.versioning@2.2", - "android.hardware.tests.versioning@2.3", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - "android.hardware.tests.versioning@2.2", - "android.hardware.tests.versioning@2.3", - ], -} diff --git a/tests/versioning/2.4/Android.mk b/tests/versioning/2.4/Android.mk deleted file mode 100644 index c716172ad8..0000000000 --- a/tests/versioning/2.4/Android.mk +++ /dev/null @@ -1,80 +0,0 @@ -# This file is autogenerated by hidl-gen. Do not edit manually. - -LOCAL_PATH := $(call my-dir) - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning-V2.4-java -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_JAVA_LIBRARIES := \ - android.hardware.tests.versioning-V2.2-java \ - android.hardware.tests.versioning-V2.3-java \ - android.hidl.base-V1.0-java \ - - -# -# Build IFoo.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_4/IFoo.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.4::IFoo - -$(GEN): $(LOCAL_PATH)/IFoo.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.tests.versioning-V2.4-java-static -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hardware.tests.versioning-V2.2-java-static \ - android.hardware.tests.versioning-V2.3-java-static \ - android.hidl.base-V1.0-java-static \ - - -# -# Build IFoo.hal -# -GEN := $(intermediates)/android/hardware/tests/versioning/V2_4/IFoo.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.hal -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.tests.versioning@2.4::IFoo - -$(GEN): $(LOCAL_PATH)/IFoo.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_STATIC_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/versioning/2.4/IFoo.hal b/tests/versioning/2.4/IFoo.hal deleted file mode 100644 index 358b56f686..0000000000 --- a/tests/versioning/2.4/IFoo.hal +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.hardware.tests.versioning@2.4; - -import @2.3::IFoo; - -// Must extend @2.3::IFoo. -interface IFoo extends @2.3::IFoo { - -};