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

Commit 784c253a authored by Sally Qi's avatar Sally Qi
Browse files

Add cc_defaults as wrapper for graphics composer/common AIDL 

interfaces.

- Add new Android.bp in graphics folder and wrap composer and common
  AIDL in to separate cc_defaults.
- remove composer3 dependency from allocator's VTS .bp file.

Bug: 243429120
Test: builds
Change-Id: Ia91e4ab87b7ac86248094317185b317d5604e654
parent 3dbeea2a

automotive/evs/aidl/impl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ package { 


cc_defaults {

    name: "EvsHalDefaults",

    defaults: ["android.hardware.graphics.common-ndk_static"],

    static_libs: [

        "android.hardware.automotive.evs-V1-ndk",

        "android.hardware.common-V2-ndk",

        "android.hardware.graphics.common-V3-ndk",

    ],

    shared_libs: [

        "libbase",

automotive/evs/aidl/vts/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ name: 
    ],

    defaults: [

        "VtsHalTargetTestDefaults",

        "android.hardware.graphics.common-ndk_static",

        "use_libaidlvintf_gtest_helper_static",

    ],

    shared_libs: [
@@ -43,7 +44,6 @@ name: 
        "android.hardware.automotive.evs@common-default-lib",

        "android.hardware.automotive.evs-V1-ndk",

        "android.hardware.common-V2-ndk",

        "android.hardware.graphics.common-V3-ndk",

        "libaidlcommonsupport",

    ],

    test_suites: [

camera/provider/aidl/vts/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ cc_test { 
    name: "VtsAidlHalCameraProvider_TargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "android.hardware.graphics.common-ndk_static",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: [
@@ -61,7 +62,6 @@ cc_test { 
        "android.hardware.camera.device-V1-ndk",

        "android.hardware.camera.metadata-V1-ndk",

        "android.hardware.camera.provider-V1-ndk",

        "android.hardware.graphics.common-V3-ndk",

        "android.hidl.allocator@1.0",

        "libgrallocusage",

        "libhidlmemory",

graphics/Android.bp

0 → 100644
+45 −0
Original line number Diff line number Diff line 
// Copyright (C) 2022 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 {

    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_defaults {

    name: "android.hardware.graphics.common-ndk_static",

    static_libs: [

        "android.hardware.graphics.common-V3-ndk",

    ],

}



cc_defaults {

    name: "android.hardware.graphics.common-ndk_shared",

    shared_libs: [

        "android.hardware.graphics.common-V3-ndk",

    ],

}



cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_static",

    static_libs: [

        "android.hardware.graphics.composer3-V1-ndk",

    ],

}



cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_shared",

    shared_libs: [

        "android.hardware.graphics.composer3-V1-ndk",

    ],

}

graphics/allocator/aidl/vts/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ cc_test { 


    shared_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.common-V3-ndk",

        "android.hardware.graphics.mapper@4.0",

        "libEGL",

        "libGLESv2",