diff options
| -rw-r--r-- | benchmarks/msgq/1.0/Android.mk | 1 | ||||
| -rw-r--r-- | nfc/1.0/Android.mk | 1 | ||||
| -rw-r--r-- | tests/bar/1.0/Android.mk | 1 | ||||
| -rw-r--r-- | tests/expression/1.0/Android.mk | 1 | ||||
| -rw-r--r-- | tests/foo/1.0/Android.mk | 17 | ||||
| -rw-r--r-- | tests/libhwbinder/1.0/Android.mk | 1 | ||||
| -rw-r--r-- | tests/msgq/1.0/Android.mk | 1 |
7 files changed, 15 insertions, 8 deletions
diff --git a/benchmarks/msgq/1.0/Android.mk b/benchmarks/msgq/1.0/Android.mk index 2f9acb337a..0f4eff1b20 100644 --- a/benchmarks/msgq/1.0/Android.mk +++ b/benchmarks/msgq/1.0/Android.mk @@ -27,6 +27,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ + libhidl \ libhwbinder \ libutils \ diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk index 5f1c9aa4af..6f84927bbf 100644 --- a/nfc/1.0/Android.mk +++ b/nfc/1.0/Android.mk @@ -61,6 +61,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ + libhidl \ libhwbinder \ libutils \ diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk index 4264ef0a55..24b498e64e 100644 --- a/tests/bar/1.0/Android.mk +++ b/tests/bar/1.0/Android.mk @@ -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 \ diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk index 98dc29e0d9..fbd7458570 100644 --- a/tests/expression/1.0/Android.mk +++ b/tests/expression/1.0/Android.mk @@ -27,6 +27,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ + libhidl \ libhwbinder \ libutils \ diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk index 23565062cd..e00ad09902 100644 --- a/tests/foo/1.0/Android.mk +++ b/tests/foo/1.0/Android.mk @@ -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 \ diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk index 796f67204d..733095c1d0 100644 --- a/tests/libhwbinder/1.0/Android.mk +++ b/tests/libhwbinder/1.0/Android.mk @@ -27,6 +27,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ + libhidl \ libhwbinder \ libutils \ diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk index cf5475a360..618c076719 100644 --- a/tests/msgq/1.0/Android.mk +++ b/tests/msgq/1.0/Android.mk @@ -27,6 +27,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ + libhidl \ libhwbinder \ libutils \ |