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

Commit 821b01c9 authored by Steven Moreland's avatar Steven Moreland
Browse files

update-makefiles.sh 

There have been some changes to the way hidl-gen generates these and
some CLs got out of sync with hidl-gen.

Test: pass
Change-Id: I33c573499d5dd37de447902fd93929b80a5df371
parent 751dc694

radio/1.0/Android.mk

+0 −38
Original line number Diff line number Diff line
@@ -73,25 +73,6 @@ $(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)

#
@@ -3107,25 +3088,6 @@ $(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)

#

tests/versioning/1.0/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",

    srcs: [

        "IFoo.hal",

        ":android.hardware.tests.versioning@1.0_hal",

    ],

    out: [

        "android/hardware/tests/versioning/1.0/FooAll.cpp",
@@ -24,7 +24,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@1.0",

    srcs: [

        "IFoo.hal",

        ":android.hardware.tests.versioning@1.0_hal",

    ],

    out: [

        "android/hardware/tests/versioning/1.0/IFoo.h",

tests/versioning/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.tests.versioning@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.tests.versioning@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)

tests/versioning/2.2/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",

    srcs: [

        "IBar.hal",

        "IFoo.hal",

        ":android.hardware.tests.versioning@2.2_hal",

    ],

    out: [

        "android/hardware/tests/versioning/2.2/BarAll.cpp",
@@ -27,8 +26,7 @@ genrule { 
    tools: ["hidl-gen"],

    cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.tests.versioning@2.2",

    srcs: [

        "IBar.hal",

        "IFoo.hal",

        ":android.hardware.tests.versioning@2.2_hal",

    ],

    out: [

        "android/hardware/tests/versioning/2.2/IBar.h",

tests/versioning/2.2/Android.mk

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