diff options
| author | Steven Moreland <smoreland@google.com> | 2017-08-11 22:59:15 +0000 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-08-11 23:02:01 +0000 |
| commit | 4f25c2a14324c92ad38a45ea30bca30973e792f6 (patch) | |
| tree | d39bf8b2001b394ad7824ceb255c51c4f8be13a7 /oemlock | |
| parent | 1020ebedfbf7c5014896266a98de562a6116d4a2 (diff) | |
Revert "Revert "Updating all makefiles.""
Relanding without automotive/vehicle/2.0+2.1 changes.
This reverts commit 1020ebedfbf7c5014896266a98de562a6116d4a2.
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: Icc49df42c2bedf443d878d5d8fbaa53441ea65db
Diffstat (limited to 'oemlock')
| -rw-r--r-- | oemlock/1.0/Android.mk | 77 |
1 files changed, 2 insertions, 75 deletions
diff --git a/oemlock/1.0/Android.mk b/oemlock/1.0/Android.mk index d9864414ae..91cc8f8cbc 100644 --- a/oemlock/1.0/Android.mk +++ b/oemlock/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 (OemLockSecureStatus) @@ -77,80 +79,5 @@ 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)) |