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

Commit d66bb6fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "interfaces: regenerate makefiles"

parents 3d49850a c6c7aabd
Loading
Loading
Loading
Loading
+28 −28
Original line number Diff line number Diff line
@@ -9,40 +9,40 @@ intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

#
# Build IBaz.hal
# Build IBase.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/BazAll.cpp
GEN := $(intermediates)/android/hardware/tests/baz/1.0/BaseAll.cpp
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBase.hal
$(GEN): $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBazCallback.hal
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
    -Lc++ -randroid.hardware:hardware/interfaces \
    android.hardware.tests.baz@1.0::IBaz
    android.hardware.tests.baz@1.0::IBase

$(GEN): $(LOCAL_PATH)/IBaz.hal
$(GEN): $(LOCAL_PATH)/IBase.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

#
# Build IBase.hal
# Build IBaz.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/BaseAll.cpp
GEN := $(intermediates)/android/hardware/tests/baz/1.0/BazAll.cpp
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBase.hal
$(GEN): $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBazCallback.hal
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
    -Lc++ -randroid.hardware:hardware/interfaces \
    android.hardware.tests.baz@1.0::IBase
    android.hardware.tests.baz@1.0::IBaz

$(GEN): $(LOCAL_PATH)/IBase.hal
$(GEN): $(LOCAL_PATH)/IBaz.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

@@ -83,40 +83,40 @@ intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

#
# Build IBaz.hal
# Build IBase.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBase.hal
$(GEN): $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBazCallback.hal
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
    -Ljava -randroid.hardware:hardware/interfaces \
    android.hardware.tests.baz@1.0::IBaz
    android.hardware.tests.baz@1.0::IBase

$(GEN): $(LOCAL_PATH)/IBaz.hal
$(GEN): $(LOCAL_PATH)/IBase.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)

#
# Build IBase.hal
# Build IBaz.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBase.hal
$(GEN): $(LOCAL_PATH)/IBase.hal
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IBazCallback.hal
$(GEN): $(LOCAL_PATH)/IBazCallback.hal
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
$(GEN): PRIVATE_CUSTOM_TOOL = \
    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
    -Ljava -randroid.hardware:hardware/interfaces \
    android.hardware.tests.baz@1.0::IBase
    android.hardware.tests.baz@1.0::IBaz

$(GEN): $(LOCAL_PATH)/IBase.hal
$(GEN): $(LOCAL_PATH)/IBaz.hal
	$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)