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

Commit f3d37254 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update for Soong-only makefiles."

parents ab4c6f8f f390f03a

automotive/evs/1.0/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ cc_library { 
    ],

}



// This package is not java compatible. Not creating java target.



// This package does not export any types. Not creating java constants export.





genrule {

    name: "android.hardware.automotive.evs@1.0-adapter-helper_genc++",

    tools: ["hidl-gen"],
@@ -116,7 +121,6 @@ genrule { 
    ],

}





cc_library {

    name: "android.hardware.automotive.evs@1.0-adapter-helper",

    defaults: ["hidl-module-defaults"],

automotive/vehicle/2.0/Android.bp

+91 −1
Original line number Diff line number Diff line
@@ -72,6 +72,97 @@ cc_library { 
    ],

}



genrule {

    name: "android.hardware.automotive.vehicle-V2.0-java_gen_java",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",

    srcs: [

        ":android.hardware.automotive.vehicle@2.0_hal",

    ],

    out: [

        "android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.java",

        "android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.java",

        "android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.java",

        "android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.java",

        "android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.java",

        "android/hardware/automotive/vehicle/V2_0/Obd2FuelType.java",

        "android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.java",

        "android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.java",

        "android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.java",

        "android/hardware/automotive/vehicle/V2_0/StatusCode.java",

        "android/hardware/automotive/vehicle/V2_0/SubscribeFlags.java",

        "android/hardware/automotive/vehicle/V2_0/SubscribeOptions.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleArea.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleDisplay.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleGear.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.java",

        "android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.java",

        "android/hardware/automotive/vehicle/V2_0/VehiclePropValue.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleProperty.java",

        "android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.java",

        "android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.java",

        "android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.java",

        "android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.java",

        "android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.java",

        "android/hardware/automotive/vehicle/V2_0/VehicleUnit.java",

        "android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VmsMessageType.java",

        "android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.java",

        "android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.java",

        "android/hardware/automotive/vehicle/V2_0/Wheel.java",

        "android/hardware/automotive/vehicle/V2_0/IVehicle.java",

        "android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java",

    ],

}



java_library {

    name: "android.hardware.automotive.vehicle-V2.0-java",

    no_framework_libs: true,

    defaults: ["hidl-java-module-defaults"],

    srcs: [":android.hardware.automotive.vehicle-V2.0-java_gen_java"],

    libs: [

        "hwbinder",

        "android.hidl.base-V1.0-java",

    ]

}



// This package does not export any types. Not creating java constants export.





genrule {

    name: "android.hardware.automotive.vehicle@2.0-adapter-helper_genc++",

    tools: ["hidl-gen"],
@@ -98,7 +189,6 @@ genrule { 
    ],

}





cc_library {

    name: "android.hardware.automotive.vehicle@2.0-adapter-helper",

    defaults: ["hidl-module-defaults"],

automotive/vehicle/2.0/Android.mk

deleted100644 → 0
+0 −1284

File deleted.

Preview size limit exceeded, changes collapsed.

broadcastradio/1.2/Android.bp

+93 −0
Original line number Diff line number Diff line
@@ -82,3 +82,96 @@ cc_library { 
        "android.hardware.broadcastradio@1.1",

    ],

}



// This package is not java compatible. Not creating java target.



// This package does not export any types. Not creating java constants export.





genrule {

    name: "android.hardware.broadcastradio@1.2-adapter-helper_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.2",

    srcs: [

        ":android.hardware.broadcastradio@1.2_hal",

    ],

    out: [

        "android/hardware/broadcastradio/1.2/ABroadcastRadioFactory.cpp",

        "android/hardware/broadcastradio/1.2/ATuner.cpp",

        "android/hardware/broadcastradio/1.2/ATunerCallback.cpp",

    ],

}



genrule {

    name: "android.hardware.broadcastradio@1.2-adapter-helper_genc++_headers",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.2",

    srcs: [

        ":android.hardware.broadcastradio@1.2_hal",

    ],

    out: [

        "android/hardware/broadcastradio/1.2/ABroadcastRadioFactory.h",

        "android/hardware/broadcastradio/1.2/ATuner.h",

        "android/hardware/broadcastradio/1.2/ATunerCallback.h",

    ],

}



cc_library {

    name: "android.hardware.broadcastradio@1.2-adapter-helper",

    defaults: ["hidl-module-defaults"],

    generated_sources: ["android.hardware.broadcastradio@1.2-adapter-helper_genc++"],

    generated_headers: ["android.hardware.broadcastradio@1.2-adapter-helper_genc++_headers"],

    export_generated_headers: ["android.hardware.broadcastradio@1.2-adapter-helper_genc++_headers"],

    vendor_available: true,

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "liblog",

        "libutils",

        "libcutils",

        "libhidladapter",

        "android.hardware.broadcastradio@1.0",

        "android.hardware.broadcastradio@1.1",

        "android.hardware.broadcastradio@1.2",

        "android.hardware.broadcastradio@1.0-adapter-helper",

        "android.hardware.broadcastradio@1.1-adapter-helper",

        "android.hidl.base@1.0-adapter-helper",

    ],

    export_shared_lib_headers: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libhidladapter",

        "android.hardware.broadcastradio@1.0",

        "android.hardware.broadcastradio@1.1",

        "android.hardware.broadcastradio@1.2",

        "android.hardware.broadcastradio@1.0-adapter-helper",

        "android.hardware.broadcastradio@1.1-adapter-helper",

        "android.hidl.base@1.0-adapter-helper",

    ],

}



genrule {

    name: "android.hardware.broadcastradio@1.2-adapter_genc++",

    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.2",

    out: ["main.cpp"]

}



cc_test {

    name: "android.hardware.broadcastradio@1.2-adapter",

    defaults: ["hidl-module-defaults"],

    shared_libs: [

        "libhidladapter",

        "libhidlbase",

        "libhidltransport",

        "libutils",

        "android.hardware.broadcastradio@1.0",

        "android.hardware.broadcastradio@1.1",

        "android.hardware.broadcastradio@1.2",

        "android.hardware.broadcastradio@1.2-adapter-helper",

    ],

    generated_sources: ["android.hardware.broadcastradio@1.2-adapter_genc++"],

}

camera/device/3.3/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ cc_library { 
    ],

}



// This package is not java compatible. Not creating java target.



// This package does not export any types. Not creating java constants export.





genrule {

    name: "android.hardware.camera.device@3.3-adapter-helper_genc++",

    tools: ["hidl-gen"],
@@ -95,7 +100,6 @@ genrule { 
    ],

}





cc_library {

    name: "android.hardware.camera.device@3.3-adapter-helper",

    defaults: ["hidl-module-defaults"],
@@ -142,6 +146,7 @@ genrule { 


cc_test {

    name: "android.hardware.camera.device@3.3-adapter",

    defaults: ["hidl-module-defaults"],

    shared_libs: [

        "libhidladapter",

        "libhidlbase",