diff options
| author | Steven Moreland <smoreland@google.com> | 2017-10-11 16:39:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 16:39:21 +0000 |
| commit | 1d7374c5e168c825b75185af53c77f4eae9eea2c (patch) | |
| tree | a7eced61ea6707420e7f706a64f4db63c0ec4611 /vr | |
| parent | 58e7856b4f72ea28f7a2be3943d80d1e4003af54 (diff) | |
| parent | 116161d94eca370d3054f0fe34b2c9d8acce70c4 (diff) | |
| download | android_hardware_interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.tar.gz android_hardware_interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.tar.bz2 android_hardware_interfaces-1d7374c5e168c825b75185af53c77f4eae9eea2c.zip | |
Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1
am: 116161d94e
Change-Id: I33643636e2511de77fdf7de57777eb67edee2e52
Diffstat (limited to 'vr')
| -rw-r--r-- | vr/1.0/Android.bp | 27 | ||||
| -rw-r--r-- | vr/1.0/Android.mk | 43 |
2 files changed, 26 insertions, 44 deletions
diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp index 6fda0e635..f0a09bf5a 100644 --- a/vr/1.0/Android.bp +++ b/vr/1.0/Android.bp @@ -62,6 +62,32 @@ cc_library { } genrule { + name: "android.hardware.vr-V1.0-java_gen_java", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0", + srcs: [ + ":android.hardware.vr@1.0_hal", + ], + out: [ + "android/hardware/vr/V1_0/IVr.java", + ], +} + +java_library { + name: "android.hardware.vr-V1.0-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.vr-V1.0-java_gen_java"], + libs: [ + "hwbinder", + "android.hidl.base-V1.0-java", + ] +} + +// This package does not export any types. Not creating java constants export. + + +genrule { name: "android.hardware.vr@1.0-adapter-helper_genc++", tools: ["hidl-gen"], cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vr@1.0", @@ -85,7 +111,6 @@ genrule { ], } - cc_library { name: "android.hardware.vr@1.0-adapter-helper", defaults: ["hidl-module-defaults"], diff --git a/vr/1.0/Android.mk b/vr/1.0/Android.mk deleted file mode 100644 index 111596303..000000000 --- a/vr/1.0/Android.mk +++ /dev/null @@ -1,43 +0,0 @@ -# This file is autogenerated by hidl-gen. Do not edit manually. - -LOCAL_PATH := $(call my-dir) - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.vr-V1.0-java -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) - -LOCAL_JAVA_LIBRARIES := \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build IVr.hal -# -GEN := $(intermediates)/android/hardware/vr/V1_0/IVr.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVr.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.vr@1.0::IVr - -$(GEN): $(LOCAL_PATH)/IVr.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) |