diff options
| author | Steven Moreland <smoreland@google.com> | 2017-08-10 15:15:40 -0700 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-08-14 20:25:09 +0000 |
| commit | dfd82875064da86c6282a112aa7c9d4ec61af9e2 (patch) | |
| tree | baec97614a1dc7bdd4e8afe1b0925b1040f4ea64 /gatekeeper | |
| parent | fe2279d2cc34559ad6de63a4051c832203e31f34 (diff) | |
| download | android_hardware_interfaces-dfd82875064da86c6282a112aa7c9d4ec61af9e2.tar.gz android_hardware_interfaces-dfd82875064da86c6282a112aa7c9d4ec61af9e2.tar.bz2 android_hardware_interfaces-dfd82875064da86c6282a112aa7c9d4ec61af9e2.zip | |
Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
Diffstat (limited to 'gatekeeper')
| -rw-r--r-- | gatekeeper/1.0/Android.bp | 5 | ||||
| -rw-r--r-- | gatekeeper/1.0/Android.mk | 77 |
2 files changed, 6 insertions, 76 deletions
diff --git a/gatekeeper/1.0/Android.bp b/gatekeeper/1.0/Android.bp index eb70c09c3..f12f38fd9 100644 --- a/gatekeeper/1.0/Android.bp +++ b/gatekeeper/1.0/Android.bp @@ -39,13 +39,16 @@ genrule { ], } -cc_library_shared { +cc_library { name: "android.hardware.gatekeeper@1.0", defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.gatekeeper@1.0_genc++"], generated_headers: ["android.hardware.gatekeeper@1.0_genc++_headers"], export_generated_headers: ["android.hardware.gatekeeper@1.0_genc++_headers"], vendor_available: true, + vndk: { + enabled: true, + }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/gatekeeper/1.0/Android.mk b/gatekeeper/1.0/Android.mk index 576f729a2..debc0d961 100644 --- a/gatekeeper/1.0/Android.mk +++ b/gatekeeper/1.0/Android.mk @@ -15,6 +15,8 @@ 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 types.hal (GatekeeperResponse) @@ -77,80 +79,5 @@ LOCAL_GENERATED_SOURCES += $(GEN) include $(BUILD_JAVA_LIBRARY) -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.gatekeeper-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 \ - - -# -# Build types.hal (GatekeeperResponse) -# -GEN := $(intermediates)/android/hardware/gatekeeper/V1_0/GatekeeperResponse.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.gatekeeper@1.0::types.GatekeeperResponse - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (GatekeeperStatusCode) -# -GEN := $(intermediates)/android/hardware/gatekeeper/V1_0/GatekeeperStatusCode.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.gatekeeper@1.0::types.GatekeeperStatusCode - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IGatekeeper.hal -# -GEN := $(intermediates)/android/hardware/gatekeeper/V1_0/IGatekeeper.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGatekeeper.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.gatekeeper@1.0::IGatekeeper - -$(GEN): $(LOCAL_PATH)/IGatekeeper.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_STATIC_JAVA_LIBRARY) - - include $(call all-makefiles-under,$(LOCAL_PATH)) |