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

Commit 5c4f5c29 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Update makefiles for Java package path." am: 698b6a96 am: 1f8c3cd2 

am: 39c5cdf8

Change-Id: I71585786f688acc458c11f51b1182eebcaf93cb7
parents 83df2470 39c5cdf8

bluetooth/1.0/Android.mk

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \ 
#

# Build types.hal (Status)

#

GEN := $(intermediates)/android/hardware/bluetooth/1.0/Status.java

GEN := $(intermediates)/android/hardware/bluetooth/V1_0/Status.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IBluetoothHci.hal

#

GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHci.java

GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHci.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHci.hal
@@ -61,7 +61,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IBluetoothHciCallbacks.hal

#

GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.java

GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHciCallbacks.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHciCallbacks.hal
@@ -98,7 +98,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
#

# Build types.hal (Status)

#

GEN := $(intermediates)/android/hardware/bluetooth/1.0/Status.java

GEN := $(intermediates)/android/hardware/bluetooth/V1_0/Status.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -117,7 +117,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IBluetoothHci.hal

#

GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHci.java

GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHci.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHci.hal
@@ -140,7 +140,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IBluetoothHciCallbacks.hal

#

GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.java

GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHciCallbacks.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHciCallbacks.hal

boot/1.0/Android.mk

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \ 
#

# Build types.hal (BoolResult)

#

GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java

GEN := $(intermediates)/android/hardware/boot/V1_0/BoolResult.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build types.hal (CommandResult)

#

GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java

GEN := $(intermediates)/android/hardware/boot/V1_0/CommandResult.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -57,7 +57,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IBootControl.hal

#

GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java

GEN := $(intermediates)/android/hardware/boot/V1_0/IBootControl.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal
@@ -94,7 +94,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
#

# Build types.hal (BoolResult)

#

GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java

GEN := $(intermediates)/android/hardware/boot/V1_0/BoolResult.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -113,7 +113,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build types.hal (CommandResult)

#

GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java

GEN := $(intermediates)/android/hardware/boot/V1_0/CommandResult.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -132,7 +132,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IBootControl.hal

#

GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java

GEN := $(intermediates)/android/hardware/boot/V1_0/IBootControl.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal

ir/1.0/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \ 
#

# Build types.hal (ConsumerIrFreqRange)

#

GEN := $(intermediates)/android/hardware/ir/1.0/ConsumerIrFreqRange.java

GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IConsumerIr.hal

#

GEN := $(intermediates)/android/hardware/ir/1.0/IConsumerIr.java

GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.hal
@@ -75,7 +75,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
#

# Build types.hal (ConsumerIrFreqRange)

#

GEN := $(intermediates)/android/hardware/ir/1.0/ConsumerIrFreqRange.java

GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -94,7 +94,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build IConsumerIr.hal

#

GEN := $(intermediates)/android/hardware/ir/1.0/IConsumerIr.java

GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.hal

nfc/1.0/Android.mk

+9 −9
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \ 
#

# Build types.hal (NfcEvent)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java

GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcEvent.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build types.hal (NfcStatus)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java

GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcStatus.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -57,7 +57,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build INfc.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java

GEN := $(intermediates)/android/hardware/nfc/V1_0/INfc.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal
@@ -80,7 +80,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build INfcClientCallback.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java

GEN := $(intermediates)/android/hardware/nfc/V1_0/INfcClientCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal
@@ -117,7 +117,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
#

# Build types.hal (NfcEvent)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java

GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcEvent.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -136,7 +136,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build types.hal (NfcStatus)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java

GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcStatus.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@@ -155,7 +155,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build INfc.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java

GEN := $(intermediates)/android/hardware/nfc/V1_0/INfc.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal
@@ -178,7 +178,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) 
#

# Build INfcClientCallback.hal

#

GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java

GEN := $(intermediates)/android/hardware/nfc/V1_0/INfcClientCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal
@@ -208,7 +208,7 @@ intermediates := $(local-generated-sources-dir) 


HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

#

GEN := $(intermediates)/android/hardware/nfc/1.0/Constants.java

GEN := $(intermediates)/android/hardware/nfc/V1_0/Constants.java

$(GEN): $(HIDL)

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

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

radio/1.0/Android.mk

+304 −304

File changed.

Preview size limit exceeded, changes collapsed.