diff options
| author | Steven Moreland <smoreland@google.com> | 2017-08-11 22:56:24 +0000 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-08-11 22:56:56 +0000 |
| commit | 1020ebedfbf7c5014896266a98de562a6116d4a2 (patch) | |
| tree | 496d54d2b5821a4fbf638a491b125230fa21a713 /oemlock/1.0 | |
| parent | 8ac1971678999c46338d751fdaec16c2e4bd78cb (diff) | |
| download | android_hardware_interfaces-1020ebedfbf7c5014896266a98de562a6116d4a2.tar.gz android_hardware_interfaces-1020ebedfbf7c5014896266a98de562a6116d4a2.tar.bz2 android_hardware_interfaces-1020ebedfbf7c5014896266a98de562a6116d4a2.zip | |
Revert "Updating all makefiles."
This reverts commit 8ac1971678999c46338d751fdaec16c2e4bd78cb.
Reason for revert: Didn't remove automotive changes from this CL.
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I1c660cffc8817ad0b33da9f6eceb3d88e7c48416
Diffstat (limited to 'oemlock/1.0')
| -rw-r--r-- | oemlock/1.0/Android.mk | 77 |
1 files changed, 75 insertions, 2 deletions
diff --git a/oemlock/1.0/Android.mk b/oemlock/1.0/Android.mk index 91cc8f8cb..d9864414a 100644 --- a/oemlock/1.0/Android.mk +++ b/oemlock/1.0/Android.mk @@ -15,8 +15,6 @@ 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 (OemLockSecureStatus) @@ -79,5 +77,80 @@ LOCAL_GENERATED_SOURCES += $(GEN) include $(BUILD_JAVA_LIBRARY) +################################################################################ + +include $(CLEAR_VARS) +LOCAL_MODULE := android.hardware.oemlock-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 (OemLockSecureStatus) +# +GEN := $(intermediates)/android/hardware/oemlock/V1_0/OemLockSecureStatus.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.oemlock@1.0::types.OemLockSecureStatus + +$(GEN): $(LOCAL_PATH)/types.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + +# +# Build types.hal (OemLockStatus) +# +GEN := $(intermediates)/android/hardware/oemlock/V1_0/OemLockStatus.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.oemlock@1.0::types.OemLockStatus + +$(GEN): $(LOCAL_PATH)/types.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + +# +# Build IOemLock.hal +# +GEN := $(intermediates)/android/hardware/oemlock/V1_0/IOemLock.java +$(GEN): $(HIDL) +$(GEN): PRIVATE_HIDL := $(HIDL) +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IOemLock.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.oemlock@1.0::IOemLock + +$(GEN): $(LOCAL_PATH)/IOemLock.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) +include $(BUILD_STATIC_JAVA_LIBRARY) + + include $(call all-makefiles-under,$(LOCAL_PATH)) |