Update makefiles.
am: 8746d80da8
Change-Id: I911fd6d2f93b033c13d815e5e007fcbc5c3aac23
diff --git a/displayservice/1.0/Android.bp b/displayservice/1.0/Android.bp
index 7d000f8..d073631 100644
--- a/displayservice/1.0/Android.bp
+++ b/displayservice/1.0/Android.bp
@@ -53,13 +53,16 @@
],
}
-cc_library_shared {
+cc_library {
name: "android.frameworks.displayservice@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.frameworks.displayservice@1.0_genc++"],
generated_headers: ["android.frameworks.displayservice@1.0_genc++_headers"],
export_generated_headers: ["android.frameworks.displayservice@1.0_genc++_headers"],
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
shared_libs: [
"libhidlbase",
"libhidltransport",
diff --git a/displayservice/1.0/Android.mk b/displayservice/1.0/Android.mk
index c272521..e6e2778 100644
--- a/displayservice/1.0/Android.mk
+++ b/displayservice/1.0/Android.mk
@@ -15,6 +15,8 @@
LOCAL_JAVA_LIBRARIES := \
android.hidl.base-V1.0-java \
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES += core-oj hwbinder
#
# Build types.hal (Status)
@@ -100,103 +102,5 @@
include $(BUILD_JAVA_LIBRARY)
-################################################################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.frameworks.displayservice-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 (Status)
-#
-GEN := $(intermediates)/android/frameworks/displayservice/V1_0/Status.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.frameworks:frameworks/hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.frameworks.displayservice@1.0::types.Status
-
-$(GEN): $(LOCAL_PATH)/types.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IDisplayEventReceiver.hal
-#
-GEN := $(intermediates)/android/frameworks/displayservice/V1_0/IDisplayEventReceiver.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IDisplayEventReceiver.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IEventCallback.hal
-$(GEN): $(LOCAL_PATH)/IEventCallback.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.frameworks:frameworks/hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.frameworks.displayservice@1.0::IDisplayEventReceiver
-
-$(GEN): $(LOCAL_PATH)/IDisplayEventReceiver.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IDisplayService.hal
-#
-GEN := $(intermediates)/android/frameworks/displayservice/V1_0/IDisplayService.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IDisplayService.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IDisplayEventReceiver.hal
-$(GEN): $(LOCAL_PATH)/IDisplayEventReceiver.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.frameworks:frameworks/hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.frameworks.displayservice@1.0::IDisplayService
-
-$(GEN): $(LOCAL_PATH)/IDisplayService.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IEventCallback.hal
-#
-GEN := $(intermediates)/android/frameworks/displayservice/V1_0/IEventCallback.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IEventCallback.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.frameworks:frameworks/hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.frameworks.displayservice@1.0::IEventCallback
-
-$(GEN): $(LOCAL_PATH)/IEventCallback.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/schedulerservice/1.0/Android.bp b/schedulerservice/1.0/Android.bp
index 43ee5f3..ba75f9b 100644
--- a/schedulerservice/1.0/Android.bp
+++ b/schedulerservice/1.0/Android.bp
@@ -35,13 +35,16 @@
],
}
-cc_library_shared {
+cc_library {
name: "android.frameworks.schedulerservice@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.frameworks.schedulerservice@1.0_genc++"],
generated_headers: ["android.frameworks.schedulerservice@1.0_genc++_headers"],
export_generated_headers: ["android.frameworks.schedulerservice@1.0_genc++_headers"],
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
shared_libs: [
"libhidlbase",
"libhidltransport",
diff --git a/schedulerservice/1.0/Android.mk b/schedulerservice/1.0/Android.mk
index bef0968..6d23dd3 100644
--- a/schedulerservice/1.0/Android.mk
+++ b/schedulerservice/1.0/Android.mk
@@ -15,6 +15,8 @@
LOCAL_JAVA_LIBRARIES := \
android.hidl.base-V1.0-java \
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES += core-oj hwbinder
#
# Build ISchedulingPolicyService.hal
@@ -37,40 +39,5 @@
include $(BUILD_JAVA_LIBRARY)
-################################################################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.frameworks.schedulerservice-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 ISchedulingPolicyService.hal
-#
-GEN := $(intermediates)/android/frameworks/schedulerservice/V1_0/ISchedulingPolicyService.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISchedulingPolicyService.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.frameworks:frameworks/hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.frameworks.schedulerservice@1.0::ISchedulingPolicyService
-
-$(GEN): $(LOCAL_PATH)/ISchedulingPolicyService.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/sensorservice/1.0/Android.bp b/sensorservice/1.0/Android.bp
index 4451f84..5e3ba38 100644
--- a/sensorservice/1.0/Android.bp
+++ b/sensorservice/1.0/Android.bp
@@ -60,13 +60,16 @@
],
}
-cc_library_shared {
+cc_library {
name: "android.frameworks.sensorservice@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.frameworks.sensorservice@1.0_genc++"],
generated_headers: ["android.frameworks.sensorservice@1.0_genc++_headers"],
export_generated_headers: ["android.frameworks.sensorservice@1.0_genc++_headers"],
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
shared_libs: [
"libhidlbase",
"libhidltransport",
diff --git a/vr/composer/1.0/Android.bp b/vr/composer/1.0/Android.bp
index d2e32c3..8479c00 100644
--- a/vr/composer/1.0/Android.bp
+++ b/vr/composer/1.0/Android.bp
@@ -35,13 +35,16 @@
],
}
-cc_library_shared {
+cc_library {
name: "android.frameworks.vr.composer@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.frameworks.vr.composer@1.0_genc++"],
generated_headers: ["android.frameworks.vr.composer@1.0_genc++_headers"],
export_generated_headers: ["android.frameworks.vr.composer@1.0_genc++_headers"],
vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
shared_libs: [
"libhidlbase",
"libhidltransport",
