diff --git a/benchmarks/msgq/1.0/Android.mk b/benchmarks/msgq/1.0/Android.mk index e4a2b62043..dec2a92176 100644 --- a/benchmarks/msgq/1.0/Android.mk +++ b/benchmarks/msgq/1.0/Android.mk @@ -17,9 +17,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmarkMsgQ.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.benchmarks.msgq@1.0::IBenchmarkMsgQ + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.benchmarks.msgq@1.0::IBenchmarkMsgQ $(GEN): $(LOCAL_PATH)/IBenchmarkMsgQ.hal $(transform-generated-source) @@ -27,10 +27,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ - libhidl \ - libhwbinder \ - libutils \ - libcutils \ + libhidl \ + libhwbinder \ + libutils \ + libcutils \ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk index c25faa477e..fd9de45643 100644 --- a/nfc/1.0/Android.mk +++ b/nfc/1.0/Android.mk @@ -17,9 +17,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(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.nfc@1.0::types + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::types $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -38,9 +38,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(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.nfc@1.0::INfc + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::INfc $(GEN): $(LOCAL_PATH)/INfc.hal $(transform-generated-source) @@ -57,9 +57,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(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.nfc@1.0::INfcClientCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::INfcClientCallback $(GEN): $(LOCAL_PATH)/INfcClientCallback.hal $(transform-generated-source) @@ -67,10 +67,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ - libhidl \ - libhwbinder \ - libutils \ - libcutils \ + libhidl \ + libhwbinder \ + libutils \ + libcutils \ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) @@ -94,9 +94,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types.nfc_event_t + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::types.nfc_event_t $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -111,9 +111,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types.nfc_status_t + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::types.nfc_status_t $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -128,9 +128,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types.nfc_data_t + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::types.nfc_data_t $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -149,9 +149,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::INfc + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::INfc $(GEN): $(LOCAL_PATH)/INfc.hal $(transform-generated-source) @@ -168,9 +168,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::INfcClientCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::INfcClientCallback $(GEN): $(LOCAL_PATH)/INfcClientCallback.hal $(transform-generated-source) @@ -197,9 +197,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types.nfc_event_t + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::types.nfc_event_t $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -214,9 +214,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types.nfc_status_t + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::types.nfc_status_t $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -231,9 +231,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types.nfc_data_t + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::types.nfc_data_t $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -252,9 +252,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::INfc + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::INfc $(GEN): $(LOCAL_PATH)/INfc.hal $(transform-generated-source) @@ -271,9 +271,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::INfcClientCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.nfc@1.0::INfcClientCallback $(GEN): $(LOCAL_PATH)/INfcClientCallback.hal $(transform-generated-source) diff --git a/tests/bar/1.0/Android.mk b/tests/bar/1.0/Android.mk index fbf3a35cc4..ef278ae381 100644 --- a/tests/bar/1.0/Android.mk +++ b/tests/bar/1.0/Android.mk @@ -17,9 +17,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBar.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.tests.bar@1.0::IBar + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.bar@1.0::IBar $(GEN): $(LOCAL_PATH)/IBar.hal $(transform-generated-source) @@ -27,11 +27,11 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ - libhidl \ - libhwbinder \ - libutils \ - libcutils \ - android.hardware.tests.foo@1.0 \ + libhidl \ + libhwbinder \ + libutils \ + libcutils \ + android.hardware.tests.foo@1.0 \ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk index f28709a521..56e2ea977b 100644 --- a/tests/baz/1.0/Android.mk +++ b/tests/baz/1.0/Android.mk @@ -17,9 +17,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(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.baz@1.0::types + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::types $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -34,9 +34,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(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::IBase + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::IBase $(GEN): $(LOCAL_PATH)/IBase.hal $(transform-generated-source) @@ -55,9 +55,9 @@ $(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::IBaz + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::IBaz $(GEN): $(LOCAL_PATH)/IBaz.hal $(transform-generated-source) @@ -72,9 +72,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(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::IBazCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::IBazCallback $(GEN): $(LOCAL_PATH)/IBazCallback.hal $(transform-generated-source) @@ -82,10 +82,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ - libhidl \ - libhwbinder \ - libutils \ - libcutils \ + libhidl \ + libhwbinder \ + libutils \ + libcutils \ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) @@ -109,9 +109,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(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::IBase + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::IBase $(GEN): $(LOCAL_PATH)/IBase.hal $(transform-generated-source) @@ -130,9 +130,9 @@ $(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::IBaz + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::IBaz $(GEN): $(LOCAL_PATH)/IBaz.hal $(transform-generated-source) @@ -147,9 +147,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(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::IBazCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::IBazCallback $(GEN): $(LOCAL_PATH)/IBazCallback.hal $(transform-generated-source) @@ -176,9 +176,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(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::IBase + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::IBase $(GEN): $(LOCAL_PATH)/IBase.hal $(transform-generated-source) @@ -197,9 +197,9 @@ $(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::IBaz + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::IBaz $(GEN): $(LOCAL_PATH)/IBaz.hal $(transform-generated-source) @@ -214,9 +214,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(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::IBazCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.baz@1.0::IBazCallback $(GEN): $(LOCAL_PATH)/IBazCallback.hal $(transform-generated-source) diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk index 21bc08e438..804af71649 100644 --- a/tests/expression/1.0/Android.mk +++ b/tests/expression/1.0/Android.mk @@ -17,9 +17,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.tests.expression@1.0::IExpression + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.expression@1.0::IExpression $(GEN): $(LOCAL_PATH)/IExpression.hal $(transform-generated-source) @@ -36,9 +36,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IExpression.hal $(GEN): $(LOCAL_PATH)/IExpression.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.tests.expression@1.0::IExpressionExt + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.expression@1.0::IExpressionExt $(GEN): $(LOCAL_PATH)/IExpressionExt.hal $(transform-generated-source) @@ -46,10 +46,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ - libhidl \ - libhwbinder \ - libutils \ - libcutils \ + libhidl \ + libhwbinder \ + libutils \ + libcutils \ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) @@ -73,9 +73,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.tests.expression@1.0::IExpression + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.expression@1.0::IExpression $(GEN): $(LOCAL_PATH)/IExpression.hal $(transform-generated-source) @@ -92,9 +92,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IExpression.hal $(GEN): $(LOCAL_PATH)/IExpression.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.tests.expression@1.0::IExpressionExt + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.expression@1.0::IExpressionExt $(GEN): $(LOCAL_PATH)/IExpressionExt.hal $(transform-generated-source) @@ -121,13 +121,32 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.tests.expression@1.0::IExpression + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.expression@1.0::IExpression $(GEN): $(LOCAL_PATH)/IExpression.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) + +# +# Build IExpressionExt.hal +# +GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpressionExt.java +$(GEN): $(HIDL) +$(GEN): PRIVATE_HIDL := $(HIDL) +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpressionExt.hal +$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IExpression.hal +$(GEN): $(LOCAL_PATH)/IExpression.hal +$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) +$(GEN): PRIVATE_CUSTOM_TOOL = \ + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.expression@1.0::IExpressionExt + +$(GEN): $(LOCAL_PATH)/IExpressionExt.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/tests/foo/1.0/Android.mk b/tests/foo/1.0/Android.mk index 14eb76bd51..ee503efebb 100644 --- a/tests/foo/1.0/Android.mk +++ b/tests/foo/1.0/Android.mk @@ -17,9 +17,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(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::types + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.foo@1.0::types $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -38,9 +38,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(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::IFoo + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.foo@1.0::IFoo $(GEN): $(LOCAL_PATH)/IFoo.hal $(transform-generated-source) @@ -55,9 +55,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(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::IFooCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.foo@1.0::IFooCallback $(GEN): $(LOCAL_PATH)/IFooCallback.hal $(transform-generated-source) @@ -65,10 +65,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ - libhidl \ - libhwbinder \ - libutils \ - libcutils \ + libhidl \ + libhwbinder \ + libutils \ + libcutils \ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk index e29b3312e5..61349afbe4 100644 --- a/tests/libhwbinder/1.0/Android.mk +++ b/tests/libhwbinder/1.0/Android.mk @@ -17,9 +17,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.tests.libhwbinder@1.0::IBenchmark + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.libhwbinder@1.0::IBenchmark $(GEN): $(LOCAL_PATH)/IBenchmark.hal $(transform-generated-source) @@ -27,10 +27,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ - libhidl \ - libhwbinder \ - libutils \ - libcutils \ + libhidl \ + libhwbinder \ + libutils \ + libcutils \ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) @@ -54,9 +54,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.tests.libhwbinder@1.0::IBenchmark + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.libhwbinder@1.0::IBenchmark $(GEN): $(LOCAL_PATH)/IBenchmark.hal $(transform-generated-source) @@ -83,9 +83,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.tests.libhwbinder@1.0::IBenchmark + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.tests.libhwbinder@1.0::IBenchmark $(GEN): $(LOCAL_PATH)/IBenchmark.hal $(transform-generated-source) diff --git a/tests/msgq/1.0/Android.mk b/tests/msgq/1.0/Android.mk index 3f97e6c367..2cde5bf991 100644 --- a/tests/msgq/1.0/Android.mk +++ b/tests/msgq/1.0/Android.mk @@ -17,9 +17,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ITestMsgQ.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.tests.msgq@1.0::ITestMsgQ + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.tests.msgq@1.0::ITestMsgQ $(GEN): $(LOCAL_PATH)/ITestMsgQ.hal $(transform-generated-source) @@ -27,10 +27,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ - libhidl \ - libhwbinder \ - libutils \ - libcutils \ + libhidl \ + libhwbinder \ + libutils \ + libcutils \ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) diff --git a/wifi/1.0/Android.mk b/wifi/1.0/Android.mk index e17771fa0b..bc31f7a952 100644 --- a/wifi/1.0/Android.mk +++ b/wifi/1.0/Android.mk @@ -17,9 +17,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(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.wifi@1.0::types + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::types $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -38,9 +38,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiEventCallback.hal $(GEN): $(LOCAL_PATH)/IWifiEventCallback.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::IWifi + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifi $(GEN): $(LOCAL_PATH)/IWifi.hal $(transform-generated-source) @@ -59,9 +59,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(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.wifi@1.0::IWifiChip + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifiChip $(GEN): $(LOCAL_PATH)/IWifiChip.hal $(transform-generated-source) @@ -78,9 +78,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(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.wifi@1.0::IWifiChipEventCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifiChipEventCallback $(GEN): $(LOCAL_PATH)/IWifiChipEventCallback.hal $(transform-generated-source) @@ -97,9 +97,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(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.wifi@1.0::IWifiEventCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Lc++ -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifiEventCallback $(GEN): $(LOCAL_PATH)/IWifiEventCallback.hal $(transform-generated-source) @@ -107,10 +107,10 @@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SHARED_LIBRARIES := \ - libhidl \ - libhwbinder \ - libutils \ - libcutils \ + libhidl \ + libhwbinder \ + libutils \ + libcutils \ LOCAL_MULTILIB := both include $(BUILD_SHARED_LIBRARY) @@ -134,9 +134,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::types.CommandFailureReason + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::types.CommandFailureReason $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -151,9 +151,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::types.FailureReason + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::types.FailureReason $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -172,9 +172,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiEventCallback.hal $(GEN): $(LOCAL_PATH)/IWifiEventCallback.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::IWifi + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifi $(GEN): $(LOCAL_PATH)/IWifi.hal $(transform-generated-source) @@ -193,9 +193,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::IWifiChip + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifiChip $(GEN): $(LOCAL_PATH)/IWifiChip.hal $(transform-generated-source) @@ -212,9 +212,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::IWifiChipEventCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifiChipEventCallback $(GEN): $(LOCAL_PATH)/IWifiChipEventCallback.hal $(transform-generated-source) @@ -231,9 +231,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::IWifiEventCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifiEventCallback $(GEN): $(LOCAL_PATH)/IWifiEventCallback.hal $(transform-generated-source) @@ -260,9 +260,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::types.CommandFailureReason + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::types.CommandFailureReason $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -277,9 +277,9 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::types.FailureReason + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::types.FailureReason $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -298,9 +298,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiEventCallback.hal $(GEN): $(LOCAL_PATH)/IWifiEventCallback.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::IWifi + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifi $(GEN): $(LOCAL_PATH)/IWifi.hal $(transform-generated-source) @@ -319,9 +319,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::IWifiChip + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifiChip $(GEN): $(LOCAL_PATH)/IWifiChip.hal $(transform-generated-source) @@ -338,9 +338,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::IWifiChipEventCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifiChipEventCallback $(GEN): $(LOCAL_PATH)/IWifiChipEventCallback.hal $(transform-generated-source) @@ -357,9 +357,9 @@ $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.wifi@1.0::IWifiEventCallback + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava -randroid.hardware:hardware/interfaces \ + android.hardware.wifi@1.0::IWifiEventCallback $(GEN): $(LOCAL_PATH)/IWifiEventCallback.hal $(transform-generated-source)