diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-09-01 00:08:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-01 00:08:22 +0000 |
| commit | c0ba83e30a2082c65447544be6cff7d5df9e3a44 (patch) | |
| tree | 602b8de8db8cc0b27582021baa31b037d826e2ce /tests/foo/1.0/Android.mk | |
| parent | 989087535a53d29d002db134cc28bbc53b482297 (diff) | |
| parent | 7ab75a73250d1a8b1be841cd5c6548c679cd6a1c (diff) | |
| download | platform_hardware_interfaces-c0ba83e30a2082c65447544be6cff7d5df9e3a44.tar.gz platform_hardware_interfaces-c0ba83e30a2082c65447544be6cff7d5df9e3a44.tar.bz2 platform_hardware_interfaces-c0ba83e30a2082c65447544be6cff7d5df9e3a44.zip | |
Merge "Updated makefiles (includes java-library rules for applicable packages)."
Diffstat (limited to 'tests/foo/1.0/Android.mk')
| -rw-r--r-- | tests/foo/1.0/Android.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk index c2cd91d2b4..14b10c310c 100644 --- a/tests/foo/1.0/Android.mk +++ b/tests/foo/1.0/Android.mk @@ -9,19 +9,19 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) # -# Build types.hal +# Build IFoo.hal # -GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp +GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.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))) + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.foo@1.0::IFoo -$(GEN): $(LOCAL_PATH)/types.hal +$(GEN): $(LOCAL_PATH)/IFoo.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) @@ -35,27 +35,27 @@ $(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))) + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.foo@1.0::IFooCallback $(GEN): $(LOCAL_PATH)/IFooCallback.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build IFoo.hal +# Build types.hal # -GEN := $(intermediates)/android/hardware/tests/foo/1.0/FooAll.cpp +GEN := $(intermediates)/android/hardware/tests/foo/1.0/types.cpp $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFoo.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))) + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.foo@1.0::types -$(GEN): $(LOCAL_PATH)/IFoo.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) |