diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-11-30 23:24:42 +0000 |
|---|---|---|
| committer | Roman Kiryanov <rkir@google.com> | 2023-11-30 23:29:15 +0000 |
| commit | fdf7bc6fe4c4246474a371918474a71e429f3ae5 (patch) | |
| tree | 4e3dfcea53ebf72d840dbdf08df2441fa60785a3 | |
| parent | 87563563db4ea19b12deea8f7e1118eff1180ee3 (diff) | |
| parent | 3fd5271e611de316848ce16bb912b5ef9f0bec2d (diff) | |
| download | goldfish-fdf7bc6fe4c4246474a371918474a71e429f3ae5.tar.gz | |
[conflict] Merge "Move files around" into main am: 4735000319 am: 17f3f8c09c am: 3fd5271e61
Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/2854546
Change-Id: I9ad1b5fd0b761496793a01839b44b3702ff32633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | board/kernel/arm64.mk | 2 | ||||
| -rw-r--r-- | board/kernel/kernel_modules.blocklist (renamed from kernel_modules.blocklist) | 0 | ||||
| -rw-r--r-- | board/kernel/x86_64.mk | 2 | ||||
| -rw-r--r-- | manifest.radio.xml | 38 | ||||
| -rw-r--r-- | product/generic.mk | 2 | ||||
| -rw-r--r-- | radio/manifest.radio.xml | 38 |
6 files changed, 41 insertions, 41 deletions
diff --git a/board/kernel/arm64.mk b/board/kernel/arm64.mk index eb2dbc94..14631fb2 100644 --- a/board/kernel/arm64.mk +++ b/board/kernel/arm64.mk @@ -29,6 +29,6 @@ BOARD_VENDOR_KERNEL_MODULES := \ $(wildcard $(VIRTUAL_DEVICE_KERNEL_MODULES_PATH)/*.ko)) BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := \ - device/generic/goldfish/kernel_modules.blocklist + device/generic/goldfish/board/kernel/kernel_modules.blocklist EMULATOR_KERNEL_FILE := $(KERNEL_ARTIFACTS_PATH)/kernel-$(TARGET_KERNEL_USE)-gz diff --git a/kernel_modules.blocklist b/board/kernel/kernel_modules.blocklist index 8dc5e712..8dc5e712 100644 --- a/kernel_modules.blocklist +++ b/board/kernel/kernel_modules.blocklist diff --git a/board/kernel/x86_64.mk b/board/kernel/x86_64.mk index 2dbe5d8b..95b98a6e 100644 --- a/board/kernel/x86_64.mk +++ b/board/kernel/x86_64.mk @@ -28,6 +28,6 @@ BOARD_VENDOR_KERNEL_MODULES := \ $(wildcard $(VIRTUAL_DEVICE_KERNEL_MODULES_PATH)/*.ko)) BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := \ - device/generic/goldfish/kernel_modules.blocklist + device/generic/goldfish/board/kernel/kernel_modules.blocklist EMULATOR_KERNEL_FILE := $(KERNEL_ARTIFACTS_PATH)/kernel-$(TARGET_KERNEL_USE) diff --git a/manifest.radio.xml b/manifest.radio.xml index 54a2a1fa..e69de29b 100644 --- a/manifest.radio.xml +++ b/manifest.radio.xml @@ -1,38 +0,0 @@ -<manifest version="1.0" type="device"> - <hal format="aidl"> - <name>android.hardware.radio.config</name> - <fqname>IRadioConfig/default</fqname> - </hal> - <hal format="aidl"> - <name>android.hardware.radio.data</name> - <fqname>IRadioData/slot1</fqname> - </hal> - <hal format="aidl"> - <name>android.hardware.radio.messaging</name> - <fqname>IRadioMessaging/slot1</fqname> - </hal> - <hal format="aidl"> - <name>android.hardware.radio.modem</name> - <fqname>IRadioModem/slot1</fqname> - </hal> - <hal format="aidl"> - <name>android.hardware.radio.network</name> - <fqname>IRadioNetwork/slot1</fqname> - </hal> - <hal format="aidl"> - <name>android.hardware.radio.sim</name> - <fqname>IRadioSim/slot1</fqname> - </hal> - <hal format="aidl"> - <name>android.hardware.radio.voice</name> - <fqname>IRadioVoice/slot1</fqname> - </hal> - <hal format="aidl"> - <name>android.hardware.radio.ims</name> - <fqname>IRadioIms/slot1</fqname> - </hal> - <hal format="aidl"> - <name>android.hardware.radio.ims.media</name> - <fqname>IImsMedia/default</fqname> - </hal> -</manifest>
\ No newline at end of file diff --git a/product/generic.mk b/product/generic.mk index 66a86b34..3c0a578d 100644 --- a/product/generic.mk +++ b/product/generic.mk @@ -111,7 +111,7 @@ PRODUCT_PACKAGES += \ EmulatorRadioConfig \ EmulatorTetheringConfigOverlay -DEVICE_MANIFEST_FILE += device/generic/goldfish/manifest.radio.xml +DEVICE_MANIFEST_FILE += device/generic/goldfish/radio/manifest.radio.xml DISABLE_RILD_OEM_HOOK := true endif diff --git a/radio/manifest.radio.xml b/radio/manifest.radio.xml new file mode 100644 index 00000000..d0a6cb61 --- /dev/null +++ b/radio/manifest.radio.xml @@ -0,0 +1,38 @@ +<manifest version="1.0" type="device"> + <hal format="aidl"> + <name>android.hardware.radio.config</name> + <fqname>IRadioConfig/default</fqname> + </hal> + <hal format="aidl"> + <name>android.hardware.radio.data</name> + <fqname>IRadioData/slot1</fqname> + </hal> + <hal format="aidl"> + <name>android.hardware.radio.messaging</name> + <fqname>IRadioMessaging/slot1</fqname> + </hal> + <hal format="aidl"> + <name>android.hardware.radio.modem</name> + <fqname>IRadioModem/slot1</fqname> + </hal> + <hal format="aidl"> + <name>android.hardware.radio.network</name> + <fqname>IRadioNetwork/slot1</fqname> + </hal> + <hal format="aidl"> + <name>android.hardware.radio.sim</name> + <fqname>IRadioSim/slot1</fqname> + </hal> + <hal format="aidl"> + <name>android.hardware.radio.voice</name> + <fqname>IRadioVoice/slot1</fqname> + </hal> + <hal format="aidl"> + <name>android.hardware.radio.ims</name> + <fqname>IRadioIms/slot1</fqname> + </hal> + <hal format="aidl"> + <name>android.hardware.radio.ims.media</name> + <fqname>IImsMedia/default</fqname> + </hal> +</manifest> |