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

Commit 0574bacb authored by Andreas Huber's avatar Andreas Huber
Browse files

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 ccb15627

bluetooth/1.0/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.bluetooth@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)
@@ -87,7 +87,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.bluetooth@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)

boot/1.0/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.boot@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.boot@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)

ir/1.0/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.ir@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.ir@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)

nfc/1.0/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.nfc@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)
@@ -106,7 +106,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.nfc@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)
@@ -204,7 +204,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.nfc@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)

#

radio/1.0/Android.mk

+154 −155
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.radio@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)
@@ -54,6 +54,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (ApnTypes)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/ApnTypes.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.ApnTypes



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (AppState)

#
@@ -1289,6 +1308,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (DeviceStateType)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/DeviceStateType.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.DeviceStateType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Dial)

#
@@ -1536,6 +1574,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (IndicationFilter)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/IndicationFilter.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.IndicationFilter



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (LastCallFailCause)

#
@@ -1650,6 +1707,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (MvnoType)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/MvnoType.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.MvnoType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (NeighboringCell)

#
@@ -2828,83 +2904,6 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)





#

# Build types.hal (MvnoType)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/MvnoType.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.MvnoType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (ApnTypes)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/ApnTypes.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.ApnTypes



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (IndicationFilter)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/IndicationFilter.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.IndicationFilter



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (DeviceStateType)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/DeviceStateType.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.DeviceStateType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IRadio.hal

#
@@ -3024,7 +3023,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := android.hardware.radio@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)
@@ -3070,6 +3069,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (ApnTypes)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/ApnTypes.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.ApnTypes



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (AppState)

#
@@ -4305,6 +4323,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (DeviceStateType)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/DeviceStateType.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.DeviceStateType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (Dial)

#
@@ -4552,6 +4589,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (IndicationFilter)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/IndicationFilter.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.IndicationFilter



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (LastCallFailCause)

#
@@ -4666,6 +4722,25 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (MvnoType)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/MvnoType.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.MvnoType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (NeighboringCell)

#
@@ -5844,82 +5919,6 @@ $(GEN): $(LOCAL_PATH)/types.hal 
	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (MvnoType)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/MvnoType.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.MvnoType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (ApnTypes)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/ApnTypes.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.ApnTypes



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (IndicationFilter)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/IndicationFilter.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.IndicationFilter



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (DeviceStateType)

#

GEN := $(intermediates)/android/hardware/radio/V1_0/DeviceStateType.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.hardware:hardware/interfaces \

        -randroid.hidl:system/libhidl/transport \

        android.hardware.radio@1.0::types.DeviceStateType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build IRadio.hal

#