From 11a169bd167ae3d518a13dd2460dd37f3332b09c Mon Sep 17 00:00:00 2001 From: Sunwook Eom Date: Fri, 3 Jan 2025 17:19:03 +0900 Subject: [PATCH] scripts: move android_on_qemu to the third-party Signed-off-by: Sunwook Eom --- .gitignore | 2 -- scripts/config.py | 6 +++--- scripts/init_android_on_qemu.sh | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0e3e3d2c2cf3..5f82ce1eedb7 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,3 @@ examples/cross-platform-e2ee/third-party-arm/ unsafe-call-trace.log unsafe-items-list.log - -android_on_qemu diff --git a/scripts/config.py b/scripts/config.py index bf27157c99c6..ba04122d756c 100755 --- a/scripts/config.py +++ b/scripts/config.py @@ -74,7 +74,7 @@ TRACE_LIB = os.path.join(PLUGIN_PATH, "TarmacTrace.so") TOGGLE_LIB = os.path.join(PLUGIN_PATH, "ToggleMTIPlugin.so") -AOSP_DIR = os.path.join(ROOT, "android_on_qemu/aosp-15.0.0_r8") -AOSP_KERNEL_OUT = os.path.join(ROOT, "android_on_qemu/android15-6.6/out/virtual_device_aarch64/dist/") +AOSP_DIR = os.path.join(THIRD_PARTY, "android_on_qemu/aosp-15.0.0_r8") +AOSP_KERNEL_OUT = os.path.join(THIRD_PARTY, "android_on_qemu/android15-6.6/out/virtual_device_aarch64/dist/") AOSP_KERNEL_INITRAMFS_PATH = os.path.join(AOSP_KERNEL_OUT, "initramfs.img") -AOSP_KERNEL_IMAGE_PATH = os.path.join(AOSP_KERNEL_OUT, "Image") \ No newline at end of file +AOSP_KERNEL_IMAGE_PATH = os.path.join(AOSP_KERNEL_OUT, "Image") diff --git a/scripts/init_android_on_qemu.sh b/scripts/init_android_on_qemu.sh index 0654881bcae8..da93a2bc5f9f 100755 --- a/scripts/init_android_on_qemu.sh +++ b/scripts/init_android_on_qemu.sh @@ -1,6 +1,6 @@ #!/bin/bash -PARENT_DIR="android_on_qemu" +PARENT_DIR="third-party/android_on_qemu" AOSP_VER="aosp-15.0.0_r8" AOSP_DIR="$PARENT_DIR/$AOSP_VER"