diff options
| author | Erwin Jansen <jansene@google.com> | 2024-01-04 10:34:07 -0800 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2024-01-04 10:34:07 -0800 |
| commit | 10902305998f1ddd6456eafe802b029b427e5df0 (patch) | |
| tree | 8abd7f2a5727981ab600d4281c3b407650c8cc2c | |
| parent | 9831e77f0e24b55ce07591dee14e5378274aa273 (diff) | |
| download | netsim-10902305998f1ddd6456eafe802b029b427e5df0.tar.gz | |
Fix netsim build dependencies
This makes sure we can build netsim from the right directories.
Bug: 288461870
Change-Id: Id36363c66bd6a95d2579396b0d8f5beff0ce92f9
| -rw-r--r-- | cmake/netsim_dependencies.cmake | 2 | ||||
| -rwxr-xr-x | scripts/build_tools.py | 7 | ||||
| -rw-r--r-- | scripts/utils.py | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/cmake/netsim_dependencies.cmake b/cmake/netsim_dependencies.cmake index ae83310..8f063f7 100644 --- a/cmake/netsim_dependencies.cmake +++ b/cmake/netsim_dependencies.cmake @@ -1,5 +1,5 @@ set(BLUETOOTH_EMULATION True) -set(AOSP ${CMAKE_CURRENT_LIST_DIR}/../../..) +get_filename_component(AOSP "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE) set(EXTERNAL ${AOSP}/external) set(EXTERNAL_QEMU ${EXTERNAL}/qemu) set(ANDROID_QEMU2_TOP_DIR ${EXTERNAL_QEMU}) diff --git a/scripts/build_tools.py b/scripts/build_tools.py index e8f5db0..acb00a4 100755 --- a/scripts/build_tools.py +++ b/scripts/build_tools.py @@ -85,7 +85,8 @@ def main(): args.out_dir = os.path.join(AOSP_ROOT, args.out_dir) out = Path(args.out_dir) - shutil.rmtree(out) + if out.exists(): + shutil.rmtree(out) out.mkdir(exist_ok=True, parents=True) @@ -119,8 +120,8 @@ def main(): with ServerConfig(presubmit, args) as cfg: # Turn on sccache? - if cfg.sccache: - launcher.append(f"-DOPTION_CCACHE=${cfg.sccache}") + #if cfg.sccache: + # launcher.append(f"-DOPTION_CCACHE=${cfg.sccache}") # Configure run(launcher, cfg.get_env(), "bld") diff --git a/scripts/utils.py b/scripts/utils.py index 4bf6124..8809fc7 100644 --- a/scripts/utils.py +++ b/scripts/utils.py @@ -40,9 +40,11 @@ TARGET_MAP = { "windows_x64": "windows_msvc-x86_64", "linux": "linux-x86_64", "linux_x64": "linux-x86_64", + "linux_x86_64": "linux-x86_64", + "linux_aarch64": "linux-aarch64", "darwin": "darwin-x86_64", "darwin_x64": "darwin-x86_64", - "linux_aarch64": "linux-aarch64", + "darwin_x86_64" : "darwin-x86_64", "darwin_aarch64": "darwin-aarch64", } @@ -57,7 +59,7 @@ AVAILABLE = { def platform_to_cmake_target(target): """Translates platform to cmake target""" - return TARGET_MAP[target] + return TARGET_MAP[target.replace("-","_")] def cmake_toolchain(target) -> str: @@ -69,7 +71,7 @@ def cmake_toolchain(target) -> str: / "android" / "build" / "cmake" - / AVAILABLE[TARGET_MAP[target]] + / AVAILABLE[TARGET_MAP[target.replace("-", "_")]] ) |