diff options
| author | Andreas Huber <andih@google.com> | 2017-02-09 10:06:41 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2017-02-09 17:20:45 -0800 |
| commit | d38f147c357a9a39ae923bff1786070faf7ba751 (patch) | |
| tree | e1d49b710f780d09a1d15f2ec9b45790e4eeff99 /camera | |
| parent | c409e30da772151fbc958524f2df4d1367b19b15 (diff) | |
| download | android_hardware_interfaces-d38f147c357a9a39ae923bff1786070faf7ba751.tar.gz android_hardware_interfaces-d38f147c357a9a39ae923bff1786070faf7ba751.tar.bz2 android_hardware_interfaces-d38f147c357a9a39ae923bff1786070faf7ba751.zip | |
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
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/common/1.0/Android.mk | 4 | ||||
| -rw-r--r-- | camera/metadata/3.2/Android.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/camera/common/1.0/Android.mk b/camera/common/1.0/Android.mk index 2e68dc0a3..9e05172bf 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 6604ccd7b..86cee910a 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) |