diff options
28 files changed, 154 insertions, 78 deletions
diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp index 4cc3b50390..48159b34ec 100644 --- a/bluetooth/1.0/Android.bp +++ b/bluetooth/1.0/Android.bp @@ -48,6 +48,7 @@ genrule { cc_library_shared { name: "android.hardware.bluetooth@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.bluetooth@1.0_genc++"], generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"], export_generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"], diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp index d75d6ac6fb..de42647ca7 100644 --- a/boot/1.0/Android.bp +++ b/boot/1.0/Android.bp @@ -41,6 +41,7 @@ genrule { cc_library_shared { name: "android.hardware.boot@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.boot@1.0_genc++"], generated_headers: ["android.hardware.boot@1.0_genc++_headers"], export_generated_headers: ["android.hardware.boot@1.0_genc++_headers"], diff --git a/configstore/1.0/Android.bp b/configstore/1.0/Android.bp index db7ec97bc4..89f99f2056 100644 --- a/configstore/1.0/Android.bp +++ b/configstore/1.0/Android.bp @@ -41,6 +41,7 @@ genrule { cc_library_shared { name: "android.hardware.configstore@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.configstore@1.0_genc++"], generated_headers: ["android.hardware.configstore@1.0_genc++_headers"], export_generated_headers: ["android.hardware.configstore@1.0_genc++_headers"], diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp index 2c53047749..a059da53dd 100644 --- a/ir/1.0/Android.bp +++ b/ir/1.0/Android.bp @@ -41,6 +41,7 @@ genrule { cc_library_shared { name: "android.hardware.ir@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.ir@1.0_genc++"], generated_headers: ["android.hardware.ir@1.0_genc++_headers"], export_generated_headers: ["android.hardware.ir@1.0_genc++_headers"], diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp index 8faf2a1ae9..7c9a66edce 100644 --- a/nfc/1.0/Android.bp +++ b/nfc/1.0/Android.bp @@ -48,6 +48,7 @@ genrule { cc_library_shared { name: "android.hardware.nfc@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.nfc@1.0_genc++"], generated_headers: ["android.hardware.nfc@1.0_genc++_headers"], export_generated_headers: ["android.hardware.nfc@1.0_genc++_headers"], diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp index b58d85a6d5..988f5d2c6e 100644 --- a/radio/1.0/Android.bp +++ b/radio/1.0/Android.bp @@ -69,6 +69,7 @@ genrule { cc_library_shared { name: "android.hardware.radio@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.radio@1.0_genc++"], generated_headers: ["android.hardware.radio@1.0_genc++_headers"], export_generated_headers: ["android.hardware.radio@1.0_genc++_headers"], diff --git a/radio/1.1/Android.bp b/radio/1.1/Android.bp index c352b6d406..3583159fef 100644 --- a/radio/1.1/Android.bp +++ b/radio/1.1/Android.bp @@ -55,6 +55,7 @@ genrule { cc_library_shared { name: "android.hardware.radio@1.1", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.radio@1.1_genc++"], generated_headers: ["android.hardware.radio@1.1_genc++_headers"], export_generated_headers: ["android.hardware.radio@1.1_genc++_headers"], diff --git a/radio/1.1/Android.mk b/radio/1.1/Android.mk index 1285619bb3..305b6618ba 100644 --- a/radio/1.1/Android.mk +++ b/radio/1.1/Android.mk @@ -18,59 +18,59 @@ LOCAL_JAVA_LIBRARIES := \ # -# Build IRadio.hal +# Build types.hal (CardPowerState) # -GEN := $(intermediates)/android/hardware/radio/V1_1/IRadio.java +GEN := $(intermediates)/android/hardware/radio/V1_1/CardPowerState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadio.hal +$(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 \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::IRadio + android.hardware.radio@1.1::types.CardPowerState -$(GEN): $(LOCAL_PATH)/IRadio.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build IRadioIndication.hal +# Build types.hal (EutranBands) # -GEN := $(intermediates)/android/hardware/radio/V1_1/IRadioIndication.java +GEN := $(intermediates)/android/hardware/radio/V1_1/EutranBands.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioIndication.hal +$(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 \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::IRadioIndication + android.hardware.radio@1.1::types.EutranBands -$(GEN): $(LOCAL_PATH)/IRadioIndication.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build IRadioResponse.hal +# Build types.hal (GeranBands) # -GEN := $(intermediates)/android/hardware/radio/V1_1/IRadioResponse.java +GEN := $(intermediates)/android/hardware/radio/V1_1/GeranBands.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioResponse.hal +$(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 \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::IRadioResponse + android.hardware.radio@1.1::types.GeranBands -$(GEN): $(LOCAL_PATH)/IRadioResponse.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) @@ -94,9 +94,9 @@ $(GEN): $(LOCAL_PATH)/types.hal LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (RadioAccessSpecifier) +# Build types.hal (NetworkScanResult) # -GEN := $(intermediates)/android/hardware/radio/V1_1/RadioAccessSpecifier.java +GEN := $(intermediates)/android/hardware/radio/V1_1/NetworkScanResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -106,16 +106,16 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.RadioAccessSpecifier + android.hardware.radio@1.1::types.NetworkScanResult $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (NetworkScanResult) +# Build types.hal (RadioAccessNetworks) # -GEN := $(intermediates)/android/hardware/radio/V1_1/NetworkScanResult.java +GEN := $(intermediates)/android/hardware/radio/V1_1/RadioAccessNetworks.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -125,16 +125,16 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.NetworkScanResult + android.hardware.radio@1.1::types.RadioAccessNetworks $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (ScanType) +# Build types.hal (RadioAccessSpecifier) # -GEN := $(intermediates)/android/hardware/radio/V1_1/ScanType.java +GEN := $(intermediates)/android/hardware/radio/V1_1/RadioAccessSpecifier.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -144,7 +144,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.ScanType + android.hardware.radio@1.1::types.RadioAccessSpecifier $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -170,9 +170,9 @@ $(GEN): $(LOCAL_PATH)/types.hal LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (RadioAccessNetworks) +# Build types.hal (ScanType) # -GEN := $(intermediates)/android/hardware/radio/V1_1/RadioAccessNetworks.java +GEN := $(intermediates)/android/hardware/radio/V1_1/ScanType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -182,16 +182,16 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.RadioAccessNetworks + android.hardware.radio@1.1::types.ScanType $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (GeranBands) +# Build types.hal (UtranBands) # -GEN := $(intermediates)/android/hardware/radio/V1_1/GeranBands.java +GEN := $(intermediates)/android/hardware/radio/V1_1/UtranBands.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -201,51 +201,75 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.GeranBands + android.hardware.radio@1.1::types.UtranBands $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (UtranBands) +# Build IRadio.hal # -GEN := $(intermediates)/android/hardware/radio/V1_1/UtranBands.java +GEN := $(intermediates)/android/hardware/radio/V1_1/IRadio.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadio.hal +$(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 \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.UtranBands + android.hardware.radio@1.1::IRadio + +$(GEN): $(LOCAL_PATH)/IRadio.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) +# +# Build IRadioIndication.hal +# +GEN := $(intermediates)/android/hardware/radio/V1_1/IRadioIndication.java +$(GEN): $(HIDL) +$(GEN): PRIVATE_HIDL := $(HIDL) +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioIndication.hal +$(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 \ + -randroid.hidl:system/libhidl/transport \ + android.hardware.radio@1.1::IRadioIndication + +$(GEN): $(LOCAL_PATH)/IRadioIndication.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (EutranBands) +# Build IRadioResponse.hal # -GEN := $(intermediates)/android/hardware/radio/V1_1/EutranBands.java +GEN := $(intermediates)/android/hardware/radio/V1_1/IRadioResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioResponse.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.EutranBands + android.hardware.radio@1.1::IRadioResponse -$(GEN): $(LOCAL_PATH)/types.hal +$(GEN): $(LOCAL_PATH)/IRadioResponse.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) include $(BUILD_JAVA_LIBRARY) + ################################################################################ include $(CLEAR_VARS) @@ -262,59 +286,59 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ # -# Build IRadio.hal +# Build types.hal (CardPowerState) # -GEN := $(intermediates)/android/hardware/radio/V1_1/IRadio.java +GEN := $(intermediates)/android/hardware/radio/V1_1/CardPowerState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadio.hal +$(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 \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::IRadio + android.hardware.radio@1.1::types.CardPowerState -$(GEN): $(LOCAL_PATH)/IRadio.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build IRadioIndication.hal +# Build types.hal (EutranBands) # -GEN := $(intermediates)/android/hardware/radio/V1_1/IRadioIndication.java +GEN := $(intermediates)/android/hardware/radio/V1_1/EutranBands.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioIndication.hal +$(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 \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::IRadioIndication + android.hardware.radio@1.1::types.EutranBands -$(GEN): $(LOCAL_PATH)/IRadioIndication.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build IRadioResponse.hal +# Build types.hal (GeranBands) # -GEN := $(intermediates)/android/hardware/radio/V1_1/IRadioResponse.java +GEN := $(intermediates)/android/hardware/radio/V1_1/GeranBands.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioResponse.hal +$(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 \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::IRadioResponse + android.hardware.radio@1.1::types.GeranBands -$(GEN): $(LOCAL_PATH)/IRadioResponse.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) @@ -338,9 +362,9 @@ $(GEN): $(LOCAL_PATH)/types.hal LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (RadioAccessSpecifier) +# Build types.hal (NetworkScanResult) # -GEN := $(intermediates)/android/hardware/radio/V1_1/RadioAccessSpecifier.java +GEN := $(intermediates)/android/hardware/radio/V1_1/NetworkScanResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -350,16 +374,16 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.RadioAccessSpecifier + android.hardware.radio@1.1::types.NetworkScanResult $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (NetworkScanResult) +# Build types.hal (RadioAccessNetworks) # -GEN := $(intermediates)/android/hardware/radio/V1_1/NetworkScanResult.java +GEN := $(intermediates)/android/hardware/radio/V1_1/RadioAccessNetworks.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -369,16 +393,16 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.NetworkScanResult + android.hardware.radio@1.1::types.RadioAccessNetworks $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (ScanType) +# Build types.hal (RadioAccessSpecifier) # -GEN := $(intermediates)/android/hardware/radio/V1_1/ScanType.java +GEN := $(intermediates)/android/hardware/radio/V1_1/RadioAccessSpecifier.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -388,7 +412,7 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.ScanType + android.hardware.radio@1.1::types.RadioAccessSpecifier $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) @@ -414,9 +438,9 @@ $(GEN): $(LOCAL_PATH)/types.hal LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (RadioAccessNetworks) +# Build types.hal (ScanType) # -GEN := $(intermediates)/android/hardware/radio/V1_1/RadioAccessNetworks.java +GEN := $(intermediates)/android/hardware/radio/V1_1/ScanType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -426,16 +450,16 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.RadioAccessNetworks + android.hardware.radio@1.1::types.ScanType $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (GeranBands) +# Build types.hal (UtranBands) # -GEN := $(intermediates)/android/hardware/radio/V1_1/GeranBands.java +GEN := $(intermediates)/android/hardware/radio/V1_1/UtranBands.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -445,49 +469,74 @@ $(GEN): PRIVATE_CUSTOM_TOOL = \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.GeranBands + android.hardware.radio@1.1::types.UtranBands $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (UtranBands) +# Build IRadio.hal # -GEN := $(intermediates)/android/hardware/radio/V1_1/UtranBands.java +GEN := $(intermediates)/android/hardware/radio/V1_1/IRadio.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadio.hal +$(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 \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.UtranBands + android.hardware.radio@1.1::IRadio + +$(GEN): $(LOCAL_PATH)/IRadio.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) +# +# Build IRadioIndication.hal +# +GEN := $(intermediates)/android/hardware/radio/V1_1/IRadioIndication.java +$(GEN): $(HIDL) +$(GEN): PRIVATE_HIDL := $(HIDL) +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioIndication.hal +$(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 \ + -randroid.hidl:system/libhidl/transport \ + android.hardware.radio@1.1::IRadioIndication + +$(GEN): $(LOCAL_PATH)/IRadioIndication.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (EutranBands) +# Build IRadioResponse.hal # -GEN := $(intermediates)/android/hardware/radio/V1_1/EutranBands.java +GEN := $(intermediates)/android/hardware/radio/V1_1/IRadioResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioResponse.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava \ -randroid.hardware:hardware/interfaces \ -randroid.hidl:system/libhidl/transport \ - android.hardware.radio@1.1::types.EutranBands + android.hardware.radio@1.1::IRadioResponse -$(GEN): $(LOCAL_PATH)/types.hal +$(GEN): $(LOCAL_PATH)/IRadioResponse.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) include $(BUILD_STATIC_JAVA_LIBRARY) + + include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/radio/deprecated/1.0/Android.bp b/radio/deprecated/1.0/Android.bp index a812a7462a..e45ecc36c8 100644 --- a/radio/deprecated/1.0/Android.bp +++ b/radio/deprecated/1.0/Android.bp @@ -51,6 +51,7 @@ genrule { cc_library_shared { name: "android.hardware.radio.deprecated@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.radio.deprecated@1.0_genc++"], generated_headers: ["android.hardware.radio.deprecated@1.0_genc++_headers"], export_generated_headers: ["android.hardware.radio.deprecated@1.0_genc++_headers"], diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp index a033b41498..d59931508a 100644 --- a/renderscript/1.0/Android.bp +++ b/renderscript/1.0/Android.bp @@ -48,6 +48,7 @@ genrule { cc_library_shared { name: "android.hardware.renderscript@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.renderscript@1.0_genc++"], generated_headers: ["android.hardware.renderscript@1.0_genc++_headers"], export_generated_headers: ["android.hardware.renderscript@1.0_genc++_headers"], diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp index e0dbe98164..4c76014ab8 100644 --- a/tests/bar/1.0/Android.bp +++ b/tests/bar/1.0/Android.bp @@ -69,6 +69,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.bar@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.bar@1.0_genc++"], generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"], diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp index cc9e2a489b..1445b11fb0 100644 --- a/tests/baz/1.0/Android.bp +++ b/tests/baz/1.0/Android.bp @@ -62,6 +62,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.baz@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.baz@1.0_genc++"], generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"], diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp index 8bdad0e7c8..0cfe47d037 100644 --- a/tests/expression/1.0/Android.bp +++ b/tests/expression/1.0/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.expression@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.expression@1.0_genc++"], generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"], diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp index 54260e9c9d..b698847069 100644 --- a/tests/foo/1.0/Android.bp +++ b/tests/foo/1.0/Android.bp @@ -69,6 +69,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.foo@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.foo@1.0_genc++"], generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"], diff --git a/tests/hash/1.0/Android.bp b/tests/hash/1.0/Android.bp index c2aa8047f5..617ddecf7d 100644 --- a/tests/hash/1.0/Android.bp +++ b/tests/hash/1.0/Android.bp @@ -37,6 +37,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.hash@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.hash@1.0_genc++"], generated_headers: ["android.hardware.tests.hash@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.hash@1.0_genc++_headers"], diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp index 6b99a55fb4..4dbcf4b240 100644 --- a/tests/inheritance/1.0/Android.bp +++ b/tests/inheritance/1.0/Android.bp @@ -58,6 +58,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.inheritance@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.inheritance@1.0_genc++"], generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"], diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp index cfebfbb567..f254bad30b 100644 --- a/tests/libhwbinder/1.0/Android.bp +++ b/tests/libhwbinder/1.0/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.libhwbinder@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.libhwbinder@1.0_genc++"], generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"], diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp index ed64f5d2de..5a62896906 100644 --- a/tests/memory/1.0/Android.bp +++ b/tests/memory/1.0/Android.bp @@ -37,6 +37,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.memory@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.memory@1.0_genc++"], generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"], diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp index 04a64f66cd..19ff89cfc6 100644 --- a/tests/msgq/1.0/Android.bp +++ b/tests/msgq/1.0/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.msgq@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.msgq@1.0_genc++"], generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"], diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp index ae0d0c8969..37fea949eb 100644 --- a/tests/pointer/1.0/Android.bp +++ b/tests/pointer/1.0/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.pointer@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.pointer@1.0_genc++"], generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"], diff --git a/tests/versioning/1.0/Android.bp b/tests/versioning/1.0/Android.bp index c3e4b57661..647e0433d8 100644 --- a/tests/versioning/1.0/Android.bp +++ b/tests/versioning/1.0/Android.bp @@ -37,6 +37,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.versioning@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.versioning@1.0_genc++"], generated_headers: ["android.hardware.tests.versioning@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.versioning@1.0_genc++_headers"], diff --git a/tests/versioning/2.2/Android.bp b/tests/versioning/2.2/Android.bp index 624a61e1eb..3a4a00322f 100644 --- a/tests/versioning/2.2/Android.bp +++ b/tests/versioning/2.2/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.versioning@2.2", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.versioning@2.2_genc++"], generated_headers: ["android.hardware.tests.versioning@2.2_genc++_headers"], export_generated_headers: ["android.hardware.tests.versioning@2.2_genc++_headers"], diff --git a/tests/versioning/2.3/Android.bp b/tests/versioning/2.3/Android.bp index 247b2ff127..65e1193063 100644 --- a/tests/versioning/2.3/Android.bp +++ b/tests/versioning/2.3/Android.bp @@ -51,6 +51,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.versioning@2.3", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.versioning@2.3_genc++"], generated_headers: ["android.hardware.tests.versioning@2.3_genc++_headers"], export_generated_headers: ["android.hardware.tests.versioning@2.3_genc++_headers"], diff --git a/tests/versioning/2.4/Android.bp b/tests/versioning/2.4/Android.bp index ff9ca1fff0..d236a1882c 100644 --- a/tests/versioning/2.4/Android.bp +++ b/tests/versioning/2.4/Android.bp @@ -37,6 +37,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.versioning@2.4", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.versioning@2.4_genc++"], generated_headers: ["android.hardware.tests.versioning@2.4_genc++_headers"], export_generated_headers: ["android.hardware.tests.versioning@2.4_genc++_headers"], diff --git a/tetheroffload/config/1.0/Android.bp b/tetheroffload/config/1.0/Android.bp index ddf7c223cf..7beefbf644 100644 --- a/tetheroffload/config/1.0/Android.bp +++ b/tetheroffload/config/1.0/Android.bp @@ -37,6 +37,7 @@ genrule { cc_library_shared { name: "android.hardware.tetheroffload.config@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tetheroffload.config@1.0_genc++"], generated_headers: ["android.hardware.tetheroffload.config@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tetheroffload.config@1.0_genc++_headers"], diff --git a/tetheroffload/control/1.0/Android.bp b/tetheroffload/control/1.0/Android.bp index 6f504460f3..d351edb817 100644 --- a/tetheroffload/control/1.0/Android.bp +++ b/tetheroffload/control/1.0/Android.bp @@ -48,6 +48,7 @@ genrule { cc_library_shared { name: "android.hardware.tetheroffload.control@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tetheroffload.control@1.0_genc++"], generated_headers: ["android.hardware.tetheroffload.control@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tetheroffload.control@1.0_genc++_headers"], diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp index 3a446086c4..c8b694c460 100644 --- a/wifi/1.0/Android.bp +++ b/wifi/1.0/Android.bp @@ -125,6 +125,7 @@ genrule { cc_library_shared { name: "android.hardware.wifi@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.wifi@1.0_genc++"], generated_headers: ["android.hardware.wifi@1.0_genc++_headers"], export_generated_headers: ["android.hardware.wifi@1.0_genc++_headers"], diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp index c692f9a3dc..9242fb67ae 100644 --- a/wifi/supplicant/1.0/Android.bp +++ b/wifi/supplicant/1.0/Android.bp @@ -118,6 +118,7 @@ genrule { cc_library_shared { name: "android.hardware.wifi.supplicant@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.wifi.supplicant@1.0_genc++"], generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"], export_generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"], |