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

Commit 69727778 authored by Steven Moreland's avatar Steven Moreland Committed by Martijn Coenen
Browse files

Stop all these merge conflicts. 

Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
parent 188ebec9

Android.bp

+1 −53
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "audio/2.0",

    "audio/2.0/default",

    "audio/common/2.0",

    "audio/effect/2.0",

    "benchmarks/msgq/1.0",

    "biometrics/fingerprint/2.1",

    "bluetooth/1.0",

    "boot/1.0",

    "broadcastradio/1.0",

    "example/extension/light/2.0",

    "gnss/1.0",

    "graphics/allocator/2.0",

    "graphics/allocator/2.0/default",

    "graphics/composer/2.1",

    "graphics/composer/2.1/default",

    "graphics/mapper/2.0",

    "graphics/mapper/2.0/default",

    "light/2.0",

    "memtrack/1.0",

    "memtrack/1.0/default",

    "nfc/1.0",

    "nfc/1.0/default",

    "nfc/1.0/vts/functional",

    "power/1.0",

    "power/1.0/default",

    "radio/1.0",

    "sensors/1.0",

    "sensors/1.0/default",

    "soundtrigger/2.0",

    "tests/bar/1.0",

    "tests/bar/1.0/default",

    "tests/baz/1.0",

    "tests/expression/1.0",

    "tests/foo/1.0",

    "tests/foo/1.0/default",

    "tests/foo/1.0/default/lib",

    "tests/libhwbinder/1.0",

    "tests/libhwbinder/1.0/default",

    "tests/msgq/1.0",

    "tests/pointer/1.0",

    "tests/pointer/1.0/default",

    "tests/pointer/1.0/default/lib",

    "thermal/1.0",

    "thermal/1.0/default",

    "tv/input/1.0",

    "vehicle/2.0",

    "vibrator/1.0",

    "vibrator/1.0/default",

    "vr/1.0",

    "vr/1.0/default",

    "wifi/1.0",

    "wifi/supplicant/1.0",

    "*"

]

audio/2.0/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -93,4 +93,9 @@ cc_library_shared { 
        "android.hardware.audio.common@2.0",

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

    ],

export_shared_lib_headers: [

    "libhidl",

    "libhwbinder",

    "libutils",

    ],

}

audio/2.0/Android.mk

0 → 100644
+44 −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.audio@2.0-java-constants

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(local-generated-sources-dir)



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

#

GEN := $(intermediates)/android/hardware/audio/2.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 \

        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/Android.bp

0 → 100644
+6 −0
Original line number Diff line number Diff line 
// This is an autogenerated file, do not edit.

subdirs = [

    "2.0",

    "common/2.0",

    "effect/2.0",

]

audio/common/2.0/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -35,4 +35,9 @@ cc_library_shared { 
        "libutils",

        "libcutils",

    ],

export_shared_lib_headers: [

    "libhidl",

    "libhwbinder",

    "libutils",

    ],

}