Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e14b7cc authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

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

am: af52b484

Change-Id: Idad63da1d39457f14bdbf3e087d36d7fd1fe5f6c
parents 98bd5591 af52b484

tests/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -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",

]

tests/versioning/1.0/Android.bp

0 → 100644
+59 −0
Original line number Diff line number Diff line 
// 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",

    ],

}

tests/versioning/1.0/Android.mk

0 → 100644
+76 −0
Original line number Diff line number Diff line 
# 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))

tests/versioning/1.0/IFoo.hal

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * 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 {

};

tests/versioning/2.2/Android.bp

0 → 100644
+68 −0
Original line number Diff line number Diff line 
// 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",

    ],

}