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

Commit 38415019 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Updated makefiles linking against libhidl. 

Bug: 30839546
Change-Id: I8c68d0b8db0816f9bfe58fc3898114fb9e151ddc
parent ab407f09

benchmarks/msgq/1.0/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 


LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)

LOCAL_SHARED_LIBRARIES := \

  libhidl \

  libhwbinder \

  libutils \

nfc/1.0/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 


LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)

LOCAL_SHARED_LIBRARIES := \

  libhidl \

  libhwbinder \

  libutils \

tests/bar/1.0/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 


LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)

LOCAL_SHARED_LIBRARIES := \

  libhidl \

  libhwbinder \

  libutils \

  android.hardware.tests.foo@1.0 \

tests/expression/1.0/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 


LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)

LOCAL_SHARED_LIBRARIES := \

  libhidl \

  libhwbinder \

  libutils \

tests/foo/1.0/Android.mk

+9 −8
Original line number Diff line number Diff line
@@ -9,36 +9,36 @@ intermediates := $(local-generated-sources-dir) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build types.hal

# Build IFooCallback.hal

#

GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp

GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooCallbackAll.cpp

$(GEN): $(HIDL)

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

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFooCallback.hal

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

$(GEN): PRIVATE_CUSTOM_TOOL = \

    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

    -Lc++ -randroid.hardware:hardware/interfaces\

    android.hardware.tests.foo@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))



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

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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IFooCallback.hal

# Build types.hal

#

GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooCallbackAll.cpp

GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp

$(GEN): $(HIDL)

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

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFooCallback.hal

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

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

$(GEN): PRIVATE_CUSTOM_TOOL = \

    $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \

    -Lc++ -randroid.hardware:hardware/interfaces\

    android.hardware.tests.foo@1.0::$(patsubst %.hal,%,$(notdir $(PRIVATE_DEPS)))



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

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

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)
@@ -61,6 +61,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 


LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)

LOCAL_SHARED_LIBRARIES := \

  libhidl \

  libhwbinder \

  libutils \