diff options
| author | Steven Moreland <smoreland@google.com> | 2016-10-25 15:45:19 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2016-10-26 12:04:37 +0200 |
| commit | 69727778a74baacb880dffbd1c6692457932bf57 (patch) | |
| tree | a405157326d8fd32a064da21b60d31f6ad3d43db /sensors | |
| parent | 188ebec9948763f8287eeba84ff74b9a4aba3c4c (diff) | |
| download | android_hardware_interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.gz android_hardware_interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.bz2 android_hardware_interfaces-69727778a74baacb880dffbd1c6692457932bf57.zip | |
Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
Diffstat (limited to 'sensors')
| -rw-r--r-- | sensors/1.0/Android.bp | 5 | ||||
| -rw-r--r-- | sensors/1.0/Android.mk | 38 | ||||
| -rw-r--r-- | sensors/Android.bp | 5 |
3 files changed, 48 insertions, 0 deletions
diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp index 32ee04918..5b1fd056a 100644 --- a/sensors/1.0/Android.bp +++ b/sensors/1.0/Android.bp @@ -43,4 +43,9 @@ cc_library_shared { "libutils", "libcutils", ], +export_shared_lib_headers: [ + "libhidl", + "libhwbinder", + "libutils", + ], } diff --git a/sensors/1.0/Android.mk b/sensors/1.0/Android.mk new file mode 100644 index 000000000..dd9e21bfe --- /dev/null +++ b/sensors/1.0/Android.mk @@ -0,0 +1,38 @@ +# This file is autogenerated by hidl-gen. Do not edit manually. + +LOCAL_PATH := $(call my-dir) + +################################################################################ + +include $(CLEAR_VARS) +LOCAL_MODULE := android.hardware.sensors@1.0-java-constants +LOCAL_MODULE_CLASS := JAVA_LIBRARIES + +intermediates := $(local-generated-sources-dir) + +HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) +# +GEN := $(intermediates)/android/hardware/sensors/1.0/Constants.java +$(GEN): $(HIDL) +$(GEN): $(LOCAL_PATH)/types.hal +$(GEN): $(LOCAL_PATH)/ISensors.hal + +$(GEN): PRIVATE_HIDL := $(HIDL) +$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) +$(GEN): PRIVATE_CUSTOM_TOOL = \ + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava-constants -randroid.hardware:hardware/interfaces \ + android.hardware.sensors@1.0 + +$(GEN): + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) +# Avoid dependency cycle of framework.jar -> this-library -> framework.jar +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-oj + +include $(BUILD_STATIC_JAVA_LIBRARY) + + + +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/sensors/Android.bp b/sensors/Android.bp new file mode 100644 index 000000000..ba90f2c9d --- /dev/null +++ b/sensors/Android.bp @@ -0,0 +1,5 @@ +// This is an autogenerated file, do not edit. +subdirs = [ + "1.0", + "1.0/default", +] |