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

Commit c3e80fa0 authored by Steven Moreland's avatar Steven Moreland
Browse files

Update for Soong java makefiles. 

Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
parent b74728a9

audio/2.0/Android.bp

+21 −1
Original line number Diff line number Diff line
@@ -109,6 +109,27 @@ cc_library { 
    ],

}



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



genrule {

    name: "android.hardware.audio-V2.0-java-constants_gen_java",

    tools: ["hidl-gen"],

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

    srcs: [

        ":android.hardware.audio@2.0_hal",

    ],

    out: [

        "android/hardware/audio/V2_0/Constants.java",

    ],

}



java_library {

    name: "android.hardware.audio-V2.0-java-constants",

    no_framework_libs: true,

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

    srcs: [":android.hardware.audio-V2.0-java-constants_gen_java"],

}



genrule {

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

    tools: ["hidl-gen"],
@@ -145,7 +166,6 @@ genrule { 
    ],

}





cc_library {

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

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

audio/2.0/Android.mk

deleted100644 → 0
+0 −46
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.audio-V2.0-java-constants

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

#

GEN := $(intermediates)/android/hardware/audio/V2_0/Constants.java

$(GEN): $(HIDL)

$(GEN): $(LOCAL_PATH)/types.hal

$(GEN): $(LOCAL_PATH)/IDevice.hal

$(GEN): $(LOCAL_PATH)/IDevicesFactory.hal

$(GEN): $(LOCAL_PATH)/IPrimaryDevice.hal

$(GEN): $(LOCAL_PATH)/IStream.hal

$(GEN): $(LOCAL_PATH)/IStreamIn.hal

$(GEN): $(LOCAL_PATH)/IStreamOut.hal

$(GEN): $(LOCAL_PATH)/IStreamOutCallback.hal



$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava-constants \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.audio@2.0



$(GEN):

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

# Avoid dependency cycle of framework.jar -> this-library -> framework.jar

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj



include $(BUILD_STATIC_JAVA_LIBRARY)







include $(call all-makefiles-under,$(LOCAL_PATH))

audio/common/2.0/Android.bp

+22 −0
Original line number Diff line number Diff line
@@ -57,3 +57,25 @@ cc_library { 
        "libutils",

    ],

}



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



genrule {

    name: "android.hardware.audio.common-V2.0-java-constants_gen_java",

    tools: ["hidl-gen"],

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

    srcs: [

        ":android.hardware.audio.common@2.0_hal",

    ],

    out: [

        "android/hardware/audio/common/V2_0/Constants.java",

    ],

}



java_library {

    name: "android.hardware.audio.common-V2.0-java-constants",

    no_framework_libs: true,

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

    srcs: [":android.hardware.audio.common-V2.0-java-constants_gen_java"],

}

// This package has no interfaces. Not creating versioning adapter.

audio/common/2.0/Android.mk

deleted100644 → 0
+0 −39
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.audio.common-V2.0-java-constants

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)



HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

#

GEN := $(intermediates)/android/hardware/audio/common/V2_0/Constants.java

$(GEN): $(HIDL)

$(GEN): $(LOCAL_PATH)/types.hal



$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)

$(GEN): PRIVATE_CUSTOM_TOOL = \

        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

        -Ljava-constants \

        -randroid.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.audio.common@2.0



$(GEN):

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

# Avoid dependency cycle of framework.jar -> this-library -> framework.jar

LOCAL_NO_STANDARD_LIBRARIES := true

LOCAL_JAVA_LIBRARIES := core-oj



include $(BUILD_STATIC_JAVA_LIBRARY)







include $(call all-makefiles-under,$(LOCAL_PATH))

audio/effect/2.0/Android.bp

+21 −1
Original line number Diff line number Diff line
@@ -158,6 +158,27 @@ cc_library { 
    ],

}



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



genrule {

    name: "android.hardware.audio.effect-V2.0-java-constants_gen_java",

    tools: ["hidl-gen"],

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

    srcs: [

        ":android.hardware.audio.effect@2.0_hal",

    ],

    out: [

        "android/hardware/audio/effect/V2_0/Constants.java",

    ],

}



java_library {

    name: "android.hardware.audio.effect-V2.0-java-constants",

    no_framework_libs: true,

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

    srcs: [":android.hardware.audio.effect-V2.0-java-constants_gen_java"],

}



genrule {

    name: "android.hardware.audio.effect@2.0-adapter-helper_genc++",

    tools: ["hidl-gen"],
@@ -208,7 +229,6 @@ genrule { 
    ],

}





cc_library {

    name: "android.hardware.audio.effect@2.0-adapter-helper",

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