Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests for enforcing minor version upgrade. am: 6283d249f9 am: 811652124d

Browse Source 
am: 10a766ff2c

Change-Id: I2368b44257ada459791a7cb3ca39a729472030bf
This commit is contained in:
Yifan Hong
2017-02-16 18:44:29 +00:00
committed by android-build-merger
parent 67188b98a8 10a766ff2c
commit a056eaeb17
5 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/versioning/2.3/Android.bp
View File

@@ -4,6 +4,7 @@ filegroup {
name: "android.hardware.tests.versioning@2.3_hal",
srcs: [
"IBar.hal",
"IBaz.hal",
"IFoo.hal",
],
}
@@ -17,6 +18,7 @@ genrule {
],
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",
],
}
@@ -34,6 +36,11 @@ genrule {
"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",
@@ -54,13 +61,17 @@ cc_library_shared {
"liblog",
"libutils",
"libcutils",
"android.hardware.tests.versioning@1.0",
"android.hardware.tests.versioning@2.2",
"android.hidl.base@1.0",
],
export_shared_lib_headers: [
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libutils",
"android.hardware.tests.versioning@1.0",
"android.hardware.tests.versioning@2.2",
"android.hidl.base@1.0",
],
}

40
tests/versioning/2.3/Android.mk
View File

@@ -13,6 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
LOCAL_JAVA_LIBRARIES := \
android.hardware.tests.versioning@1.0-java \
android.hardware.tests.versioning@2.2-java \
android.hidl.base@1.0-java \
@@ -36,6 +37,25 @@ $(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
#
@@ -68,6 +88,7 @@ intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
LOCAL_STATIC_JAVA_LIBRARIES := \
android.hardware.tests.versioning@1.0-java-static \
android.hardware.tests.versioning@2.2-java-static \
android.hidl.base@1.0-java-static \
@@ -91,6 +112,25 @@ $(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
#

2
tests/versioning/2.3/IBar.hal
View File

@@ -18,7 +18,7 @@ package android.hardware.tests.versioning@2.3;
import @2.2::IBar;
// Must extend @2.3::IBar.
// Must extend @2.2::IBar.
interface IBar extends @2.2::IBar {
};

23
tests/versioning/2.3/IBaz.hal Normal file
View File

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

2
tests/versioning/2.3/IFoo.hal
View File

@@ -18,7 +18,7 @@ package android.hardware.tests.versioning@2.3;
import @2.2::IFoo;
// Must extend @2.3::IFoo.
// Must extend @2.2::IFoo.
interface IFoo extends @2.2::IFoo {
};