summaryrefslogtreecommitdiff
path: root/transport/base
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2017-02-09 10:08:04 -0800
committerAndreas Huber <andih@google.com>2017-02-09 10:08:04 -0800
commit7c40088f1fb8fe423a51d9813f7930a6c6ce1712 (patch)
tree01bad3754b1e3345618471b0e0877040f7c17bdc /transport/base
parent93b6ecb3e9cd34c4bea976063d125884af4c03d3 (diff)
downloadlibhidl-7c40088f1fb8fe423a51d9813f7930a6c6ce1712.tar.gz
Updated makefiles
Java intermediates are now created in the common rather than the device- specific generated sources subdirectory. Bug: 33842609 Test: make Change-Id: I8efbd3fc28be86d9b511e2f6fbe1826256b070e0
Diffstat (limited to 'transport/base')
-rw-r--r--transport/base/1.0/Android.bp8
-rw-r--r--transport/base/1.0/Android.mk4
2 files changed, 10 insertions, 2 deletions
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index c169304..eb6b88f 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -1,5 +1,13 @@
// This file is autogenerated by hidl-gen. Do not edit manually.
+filegroup {
+ name: "android.hidl.base@1.0_hal",
+ srcs: [
+ "types.hal",
+ "IBase.hal",
+ ],
+}
+
genrule {
name: "android.hidl.base@1.0_genc++",
tools: ["hidl-gen"],
diff --git a/transport/base/1.0/Android.mk b/transport/base/1.0/Android.mk
index 0d2ff24..c4a1de9 100644
--- a/transport/base/1.0/Android.mk
+++ b/transport/base/1.0/Android.mk
@@ -8,7 +8,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := android.hidl.base@1.0-java
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
@@ -58,7 +58,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := android.hidl.base@1.0-java-static
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-intermediates := $(local-generated-sources-dir)
+intermediates := $(call local-generated-sources-dir, COMMON)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)