diff options
| author | Steven Moreland <smoreland@google.com> | 2017-08-04 19:33:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-04 19:33:23 +0000 |
| commit | 92a268afa35bd6d61c6b9da5b63409f1ee234653 (patch) | |
| tree | ffc644ff7bb0bdf0443588b5d8d88f98f9631f2c /ir | |
| parent | b08d3972fae2af48fa8c688eceb690416748e46f (diff) | |
| parent | 4e06dd1aa94fbbda0705c697a61aa877f123d7a0 (diff) | |
| download | android_hardware_interfaces-92a268afa35bd6d61c6b9da5b63409f1ee234653.tar.gz android_hardware_interfaces-92a268afa35bd6d61c6b9da5b63409f1ee234653.tar.bz2 android_hardware_interfaces-92a268afa35bd6d61c6b9da5b63409f1ee234653.zip | |
Merge changes from topic 'go-away-static-hidl-java' am: f4c58cd48c
am: 4e06dd1aa9
Change-Id: I3e381dd323532e4092fe836f18206e0d23a030d1
Diffstat (limited to 'ir')
| -rw-r--r-- | ir/1.0/Android.mk | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/ir/1.0/Android.mk b/ir/1.0/Android.mk index 96812df85..eca46f5a9 100644 --- a/ir/1.0/Android.mk +++ b/ir/1.0/Android.mk @@ -60,63 +60,5 @@ LOCAL_GENERATED_SOURCES += $(GEN) include $(BUILD_JAVA_LIBRARY) -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.ir-V1.0-java-static -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hidl.base-V1.0-java-static \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj hwbinder - -# -# Build types.hal (ConsumerIrFreqRange) -# -GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.java -$(GEN): $(HIDL) -$(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 \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.ir@1.0::types.ConsumerIrFreqRange - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IConsumerIr.hal -# -GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.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.ir@1.0::IConsumerIr - -$(GEN): $(LOCAL_PATH)/IConsumerIr.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_STATIC_JAVA_LIBRARY) - - include $(call all-makefiles-under,$(LOCAL_PATH)) |