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 /thermal | |
parent | 1020ebedfbf7c5014896266a98de562a6116d4a2 (diff) | |
download | android_hardware_interfaces-4f25c2a14324c92ad38a45ea30bca30973e792f6.tar.gz android_hardware_interfaces-4f25c2a14324c92ad38a45ea30bca30973e792f6.tar.bz2 android_hardware_interfaces-4f25c2a14324c92ad38a45ea30bca30973e792f6.zip |
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 'thermal')
-rw-r--r-- | thermal/1.0/Android.mk | 172 | ||||
-rw-r--r-- | thermal/1.1/Android.bp | 5 | ||||
-rw-r--r-- | thermal/1.1/Android.mk | 59 |
3 files changed, 8 insertions, 228 deletions
diff --git a/thermal/1.0/Android.mk b/thermal/1.0/Android.mk index 5a0a9a0a8..0b8206ea2 100644 --- a/thermal/1.0/Android.mk +++ b/thermal/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 (CoolingDevice) @@ -175,176 +177,6 @@ include $(BUILD_JAVA_LIBRARY) ################################################################################ include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.thermal-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 (CoolingDevice) -# -GEN := $(intermediates)/android/hardware/thermal/V1_0/CoolingDevice.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.thermal@1.0::types.CoolingDevice - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (CoolingType) -# -GEN := $(intermediates)/android/hardware/thermal/V1_0/CoolingType.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.thermal@1.0::types.CoolingType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (CpuUsage) -# -GEN := $(intermediates)/android/hardware/thermal/V1_0/CpuUsage.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.thermal@1.0::types.CpuUsage - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Temperature) -# -GEN := $(intermediates)/android/hardware/thermal/V1_0/Temperature.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.thermal@1.0::types.Temperature - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (TemperatureType) -# -GEN := $(intermediates)/android/hardware/thermal/V1_0/TemperatureType.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.thermal@1.0::types.TemperatureType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (ThermalStatus) -# -GEN := $(intermediates)/android/hardware/thermal/V1_0/ThermalStatus.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.thermal@1.0::types.ThermalStatus - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (ThermalStatusCode) -# -GEN := $(intermediates)/android/hardware/thermal/V1_0/ThermalStatusCode.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.thermal@1.0::types.ThermalStatusCode - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IThermal.hal -# -GEN := $(intermediates)/android/hardware/thermal/V1_0/IThermal.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IThermal.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.thermal@1.0::IThermal - -$(GEN): $(LOCAL_PATH)/IThermal.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_STATIC_JAVA_LIBRARY) - - -################################################################################ - -include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.thermal-V1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES diff --git a/thermal/1.1/Android.bp b/thermal/1.1/Android.bp index 833f219ed..0985d947b 100644 --- a/thermal/1.1/Android.bp +++ b/thermal/1.1/Android.bp @@ -42,13 +42,16 @@ genrule { ], } -cc_library_shared { +cc_library { name: "android.hardware.thermal@1.1", defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.thermal@1.1_genc++"], generated_headers: ["android.hardware.thermal@1.1_genc++_headers"], export_generated_headers: ["android.hardware.thermal@1.1_genc++_headers"], vendor_available: true, + vndk: { + enabled: true, + }, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/thermal/1.1/Android.mk b/thermal/1.1/Android.mk index 082d65b81..059ac8bde 100644 --- a/thermal/1.1/Android.mk +++ b/thermal/1.1/Android.mk @@ -16,6 +16,8 @@ LOCAL_JAVA_LIBRARIES := \ android.hardware.thermal-V1.0-java \ android.hidl.base-V1.0-java \ +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES += core-oj hwbinder # # Build IThermal.hal @@ -59,62 +61,5 @@ LOCAL_GENERATED_SOURCES += $(GEN) include $(BUILD_JAVA_LIBRARY) -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.thermal-V1.1-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.hardware.thermal-V1.0-java-static \ - android.hidl.base-V1.0-java-static \ - - -# -# Build IThermal.hal -# -GEN := $(intermediates)/android/hardware/thermal/V1_1/IThermal.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IThermal.hal -$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IThermalCallback.hal -$(GEN): $(LOCAL_PATH)/IThermalCallback.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.thermal@1.1::IThermal - -$(GEN): $(LOCAL_PATH)/IThermal.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IThermalCallback.hal -# -GEN := $(intermediates)/android/hardware/thermal/V1_1/IThermalCallback.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IThermalCallback.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.thermal@1.1::IThermalCallback - -$(GEN): $(LOCAL_PATH)/IThermalCallback.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_STATIC_JAVA_LIBRARY) - - include $(call all-makefiles-under,$(LOCAL_PATH)) |