From d38f147c357a9a39ae923bff1786070faf7ba751 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 9 Feb 2017 10:06:41 -0800 Subject: [PATCH] Updated makefiles Java intermediates are now created in the common rather than the device- specific generated sources subdirectory. Bug: 33842609 Test: make Change-Id: I16af4cd19bf0b24baa0ad9ebfdb86b4d959c8672 --- audio/2.0/Android.mk | 2 +- audio/common/2.0/Android.mk | 2 +- audio/effect/2.0/Android.mk | 2 +- automotive/vehicle/2.0/Android.mk | 4 ++-- biometrics/fingerprint/2.1/Android.mk | 4 ++-- camera/common/1.0/Android.mk | 4 ++-- camera/metadata/3.2/Android.mk | 4 ++-- configstore/1.0/Android.mk | 4 ++-- contexthub/1.0/Android.mk | 4 ++-- example/extension/light/2.0/Android.mk | 4 ++-- gatekeeper/1.0/Android.mk | 4 ++-- gnss/1.0/Android.mk | 6 +++--- graphics/common/1.0/Android.mk | 6 +++--- health/1.0/Android.mk | 6 +++--- light/2.0/Android.mk | 4 ++-- memtrack/1.0/Android.mk | 4 ++-- power/1.0/Android.mk | 4 ++-- sensors/1.0/Android.mk | 2 +- thermal/1.0/Android.mk | 6 +++--- tv/cec/1.0/Android.mk | 4 ++-- usb/1.0/Android.mk | 6 +++--- vibrator/1.0/Android.mk | 4 ++-- vr/1.0/Android.mk | 4 ++-- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/audio/2.0/Android.mk b/audio/2.0/Android.mk index f8767ecd77..e989364033 100644 --- a/audio/2.0/Android.mk +++ b/audio/2.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.audio@2.0-java-constants 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) # diff --git a/audio/common/2.0/Android.mk b/audio/common/2.0/Android.mk index 423fe3564f..7d62779de5 100644 --- a/audio/common/2.0/Android.mk +++ b/audio/common/2.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.audio.common@2.0-java-constants 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) # diff --git a/audio/effect/2.0/Android.mk b/audio/effect/2.0/Android.mk index 3383efddfa..d71255e250 100644 --- a/audio/effect/2.0/Android.mk +++ b/audio/effect/2.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.audio.effect@2.0-java-constants 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) # diff --git a/automotive/vehicle/2.0/Android.mk b/automotive/vehicle/2.0/Android.mk index ca83918001..c540027707 100644 --- a/automotive/vehicle/2.0/Android.mk +++ b/automotive/vehicle/2.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.automotive.vehicle@2.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) @@ -1189,7 +1189,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.automotive.vehicle@2.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) diff --git a/biometrics/fingerprint/2.1/Android.mk b/biometrics/fingerprint/2.1/Android.mk index 22da268f53..567b38a1bb 100644 --- a/biometrics/fingerprint/2.1/Android.mk +++ b/biometrics/fingerprint/2.1/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-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) @@ -239,7 +239,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-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) diff --git a/camera/common/1.0/Android.mk b/camera/common/1.0/Android.mk index 2e68dc0a36..9e05172bfd 100644 --- a/camera/common/1.0/Android.mk +++ b/camera/common/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.camera.common@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) @@ -191,7 +191,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.camera.common@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) diff --git a/camera/metadata/3.2/Android.mk b/camera/metadata/3.2/Android.mk index 6604ccd7be..86cee910ad 100644 --- a/camera/metadata/3.2/Android.mk +++ b/camera/metadata/3.2/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.camera.metadata@3.2-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) @@ -1236,7 +1236,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.camera.metadata@3.2-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) diff --git a/configstore/1.0/Android.mk b/configstore/1.0/Android.mk index fd2718e608..010d5093b1 100644 --- a/configstore/1.0/Android.mk +++ b/configstore/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.configstore@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) @@ -159,7 +159,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.configstore@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) diff --git a/contexthub/1.0/Android.mk b/contexthub/1.0/Android.mk index c73c5c46ff..a053986833 100644 --- a/contexthub/1.0/Android.mk +++ b/contexthub/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.contexthub@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) @@ -334,7 +334,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.contexthub@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) diff --git a/example/extension/light/2.0/Android.mk b/example/extension/light/2.0/Android.mk index deb7a2ace0..0b7974748b 100644 --- a/example/extension/light/2.0/Android.mk +++ b/example/extension/light/2.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.example.extension.light@2.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) @@ -103,7 +103,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.example.extension.light@2.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) diff --git a/gatekeeper/1.0/Android.mk b/gatekeeper/1.0/Android.mk index 5d66b4589a..70206ff035 100644 --- a/gatekeeper/1.0/Android.mk +++ b/gatekeeper/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gatekeeper@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) @@ -83,7 +83,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gatekeeper@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) diff --git a/gnss/1.0/Android.mk b/gnss/1.0/Android.mk index 98c547c0c9..5985c87516 100644 --- a/gnss/1.0/Android.mk +++ b/gnss/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@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) @@ -530,7 +530,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@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) @@ -1052,7 +1052,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.gnss@1.0-java-constants 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) # diff --git a/graphics/common/1.0/Android.mk b/graphics/common/1.0/Android.mk index 0fa6dcc428..c08053de4d 100644 --- a/graphics/common/1.0/Android.mk +++ b/graphics/common/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.graphics.common@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) @@ -134,7 +134,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.graphics.common@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) @@ -260,7 +260,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.graphics.common@1.0-java-constants 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) # diff --git a/health/1.0/Android.mk b/health/1.0/Android.mk index f05d22771e..ebb89a7dbd 100644 --- a/health/1.0/Android.mk +++ b/health/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.health@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) @@ -140,7 +140,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.health@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) @@ -272,7 +272,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.health@1.0-java-constants 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) # diff --git a/light/2.0/Android.mk b/light/2.0/Android.mk index ef19bad725..7bb429366f 100644 --- a/light/2.0/Android.mk +++ b/light/2.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.light@2.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) @@ -140,7 +140,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.light@2.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) diff --git a/memtrack/1.0/Android.mk b/memtrack/1.0/Android.mk index eeb67f6268..62bee97cc0 100644 --- a/memtrack/1.0/Android.mk +++ b/memtrack/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.memtrack@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) @@ -121,7 +121,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.memtrack@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) diff --git a/power/1.0/Android.mk b/power/1.0/Android.mk index 4e11867f3b..98d95a8595 100644 --- a/power/1.0/Android.mk +++ b/power/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.power@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) @@ -140,7 +140,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.power@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) diff --git a/sensors/1.0/Android.mk b/sensors/1.0/Android.mk index 5784916671..29f7c7e061 100644 --- a/sensors/1.0/Android.mk +++ b/sensors/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.sensors@1.0-java-constants 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) # diff --git a/thermal/1.0/Android.mk b/thermal/1.0/Android.mk index b88bb8153f..7748b9e207 100644 --- a/thermal/1.0/Android.mk +++ b/thermal/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.thermal@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) @@ -178,7 +178,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.thermal@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) @@ -348,7 +348,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.thermal@1.0-java-constants 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) # diff --git a/tv/cec/1.0/Android.mk b/tv/cec/1.0/Android.mk index efa71a154d..b08099e240 100644 --- a/tv/cec/1.0/Android.mk +++ b/tv/cec/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.tv.cec@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) @@ -296,7 +296,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.tv.cec@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) diff --git a/usb/1.0/Android.mk b/usb/1.0/Android.mk index 0eded5bab3..7be71471fc 100644 --- a/usb/1.0/Android.mk +++ b/usb/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.usb@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) @@ -201,7 +201,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.usb@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) @@ -394,7 +394,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.usb@1.0-java-constants 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) # diff --git a/vibrator/1.0/Android.mk b/vibrator/1.0/Android.mk index 1437d4402c..4e1ba6a623 100644 --- a/vibrator/1.0/Android.mk +++ b/vibrator/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.vibrator@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) @@ -64,7 +64,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.vibrator@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) diff --git a/vr/1.0/Android.mk b/vr/1.0/Android.mk index 1b8e8c7528..0fbdaf77b2 100644 --- a/vr/1.0/Android.mk +++ b/vr/1.0/Android.mk @@ -8,7 +8,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.vr@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) @@ -43,7 +43,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.vr@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)