tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add tests for minor version upgrade enforcement." am: ea8ff054fa am: af52b48490

Browse source 
am: 2e14b7cc0f

Change-Id: Ia0c520eb080e02b0b51d86b0c8f88da2cbe1c429
This commit is contained in:
Yifan Hong 2017-02-10 23:44:42 +00:00 committed by android-build-merger
commit 982f85242c
12 changed files with 614 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/Android.bp
View file

@ -17,4 +17,7 @@ subdirs = [
"pointer/1.0",
"pointer/1.0/default",
"pointer/1.0/default/lib",
"versioning/1.0",
"versioning/2.2",
"versioning/2.3",
]

59
tests/versioning/1.0/Android.bp Normal file
View file

@ -0,0 +1,59 @@
// 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++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",
srcs: [
"IFoo.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++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",
srcs: [
"IFoo.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",
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"],
shared_libs: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"libcutils",
"android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
"android.hidl.base@1.0",
],
}

76
tests/versioning/1.0/Android.mk Normal file
View file

@ -0,0 +1,76 @@
# 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@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
LOCAL_JAVA_LIBRARIES := \
android.hidl.base@1.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@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
LOCAL_STATIC_JAVA_LIBRARIES := \
android.hidl.base@1.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))

20
tests/versioning/1.0/IFoo.hal Normal file
View file

@ -0,0 +1,20 @@
/*
* 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 {
};

68
tests/versioning/2.2/Android.bp Normal file
View file

@ -0,0 +1,68 @@
// 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++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",
srcs: [
"IBar.hal",
"IFoo.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++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",
srcs: [
"IBar.hal",
"IFoo.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",
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"],
shared_libs: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"libcutils",
"android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
"android.hidl.base@1.0",
],
}

114
tests/versioning/2.2/Android.mk Normal file
View file

@ -0,0 +1,114 @@
# 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@2.2-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
LOCAL_JAVA_LIBRARIES := \
android.hidl.base@1.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@2.2-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
LOCAL_STATIC_JAVA_LIBRARIES := \
android.hidl.base@1.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))

21
tests/versioning/2.2/IBar.hal Normal file
View file

@ -0,0 +1,21 @@
/*
* 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 {
};

21
tests/versioning/2.2/IFoo.hal Normal file
View file

@ -0,0 +1,21 @@
/*
* 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 {
};

68
tests/versioning/2.3/Android.bp Normal file
View file

@ -0,0 +1,68 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
filegroup {
name: "android.hardware.tests.versioning@2.3_hal",
srcs: [
"IBar.hal",
"IFoo.hal",
],
}
genrule {
name: "android.hardware.tests.versioning@2.3_genc++",
tools: ["hidl-gen"],
cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3",
srcs: [
"IBar.hal",
"IFoo.hal",
],
out: [
"android/hardware/tests/versioning/2.3/BarAll.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++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.3",
srcs: [
"IBar.hal",
"IFoo.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/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",
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"],
shared_libs: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"libcutils",
"android.hardware.tests.versioning@2.2",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.tests.versioning@2.2",
],
}

116
tests/versioning/2.3/Android.mk Normal file
View file

@ -0,0 +1,116 @@
# 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@2.3-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
LOCAL_JAVA_LIBRARIES := \
android.hardware.tests.versioning@2.2-java \
android.hidl.base@1.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 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@2.3-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
LOCAL_STATIC_JAVA_LIBRARIES := \
android.hardware.tests.versioning@2.2-java-static \
android.hidl.base@1.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 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))

24
tests/versioning/2.3/IBar.hal Normal file
View file

@ -0,0 +1,24 @@
/*
* 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.3::IBar.
interface IBar extends @2.2::IBar {
};

24
tests/versioning/2.3/IFoo.hal Normal file
View file

@ -0,0 +1,24 @@
/*
* 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.3::IFoo.
interface IFoo extends @2.2::IFoo {
};