summaryrefslogtreecommitdiffstats
path: root/ir
diff options
context:
space:
mode:
authorSteven Moreland2017-08-04 14:14:48 -0500
committerGerrit Code Review2017-08-04 14:14:48 -0500
commitf4c58cd48cee451d801e2e40a94afb08fce89657 (patch)
tree11bc17e6e45171546a81dd38ef7bfabae51846d6 /ir
parentafcdb1effb2c0309ff51160a1fd0a5b93d7f6360 (diff)
parentb5da32c177af28aff1ab30348cba7a792bad79e4 (diff)
downloadplatform-hardware-interfaces-f4c58cd48cee451d801e2e40a94afb08fce89657.tar.gz
platform-hardware-interfaces-f4c58cd48cee451d801e2e40a94afb08fce89657.tar.xz
platform-hardware-interfaces-f4c58cd48cee451d801e2e40a94afb08fce89657.zip
Merge changes from topic 'go-away-static-hidl-java'
* changes: Update makefiles. Add an empty 1.1 ISap interface. [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
Diffstat (limited to 'ir')
-rw-r--r--ir/1.0/Android.mk58
1 files changed, 0 insertions, 58 deletions
diff --git a/ir/1.0/Android.mk b/ir/1.0/Android.mk
index 96812df8..eca46f5a 100644
--- a/ir/1.0/Android.mk
+++ b/ir/1.0/Android.mk
@@ -60,63 +60,5 @@ LOCAL_GENERATED_SOURCES += $(GEN)
60include $(BUILD_JAVA_LIBRARY) 60include $(BUILD_JAVA_LIBRARY)
61 61
62 62
63################################################################################
64
65include $(CLEAR_VARS)
66LOCAL_MODULE := android.hardware.ir-V1.0-java-static
67LOCAL_MODULE_CLASS := JAVA_LIBRARIES
68
69intermediates := $(call local-generated-sources-dir, COMMON)
70
71HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
72
73LOCAL_STATIC_JAVA_LIBRARIES := \
74 android.hidl.base-V1.0-java-static \
75
76LOCAL_NO_STANDARD_LIBRARIES := true
77LOCAL_JAVA_LIBRARIES := core-oj hwbinder
78
79#
80# Build types.hal (ConsumerIrFreqRange)
81#
82GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.java
83$(GEN): $(HIDL)
84$(GEN): PRIVATE_HIDL := $(HIDL)
85$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
86$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
87$(GEN): PRIVATE_CUSTOM_TOOL = \
88 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
89 -Ljava \
90 -randroid.hardware:hardware/interfaces \
91 -randroid.hidl:system/libhidl/transport \
92 android.hardware.ir@1.0::types.ConsumerIrFreqRange
93
94$(GEN): $(LOCAL_PATH)/types.hal
95 $(transform-generated-source)
96LOCAL_GENERATED_SOURCES += $(GEN)
97
98#
99# Build IConsumerIr.hal
100#
101GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java
102$(GEN): $(HIDL)
103$(GEN): PRIVATE_HIDL := $(HIDL)
104$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.hal
105$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
106$(GEN): $(LOCAL_PATH)/types.hal
107$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
108$(GEN): PRIVATE_CUSTOM_TOOL = \
109 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
110 -Ljava \
111 -randroid.hardware:hardware/interfaces \
112 -randroid.hidl:system/libhidl/transport \
113 android.hardware.ir@1.0::IConsumerIr
114
115$(GEN): $(LOCAL_PATH)/IConsumerIr.hal
116 $(transform-generated-source)
117LOCAL_GENERATED_SOURCES += $(GEN)
118include $(BUILD_STATIC_JAVA_LIBRARY)
119
120
121 63
122include $(call all-makefiles-under,$(LOCAL_PATH)) 64include $(call all-makefiles-under,$(LOCAL_PATH))