Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d38f147c authored Feb 09, 2017 by Andreas Huber

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

parent c409e30d

audio/2.0/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ include $(CLEAR_VARS)
	LOCAL_MODULE := android.hardware.audio@2.0-java-constants		LOCAL_MODULE := android.hardware.audio@2.0-java-constants
	LOCAL_MODULE_CLASS := JAVA_LIBRARIES		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)		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
	#		#

audio/common/2.0/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ include $(CLEAR_VARS)
	LOCAL_MODULE := android.hardware.audio.common@2.0-java-constants		LOCAL_MODULE := android.hardware.audio.common@2.0-java-constants
	LOCAL_MODULE_CLASS := JAVA_LIBRARIES		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)		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
	#		#

audio/effect/2.0/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ include $(CLEAR_VARS)
	LOCAL_MODULE := android.hardware.audio.effect@2.0-java-constants		LOCAL_MODULE := android.hardware.audio.effect@2.0-java-constants
	LOCAL_MODULE_CLASS := JAVA_LIBRARIES		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)		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
	#		#

automotive/vehicle/2.0/Android.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ include $(CLEAR_VARS)
	LOCAL_MODULE := android.hardware.automotive.vehicle@2.0-java		LOCAL_MODULE := android.hardware.automotive.vehicle@2.0-java
	LOCAL_MODULE_CLASS := JAVA_LIBRARIES		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)		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 := android.hardware.automotive.vehicle@2.0-java-static
	LOCAL_MODULE_CLASS := JAVA_LIBRARIES		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)		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

biometrics/fingerprint/2.1/Android.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ include $(CLEAR_VARS)
	LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-java		LOCAL_MODULE := android.hardware.biometrics.fingerprint@2.1-java
	LOCAL_MODULE_CLASS := JAVA_LIBRARIES		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)		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 := android.hardware.biometrics.fingerprint@2.1-java-static
	LOCAL_MODULE_CLASS := JAVA_LIBRARIES		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)		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)