From 95581ec982fcedcdfd3c8d27b4afdb6348af38d1 Mon Sep 17 00:00:00 2001 From: Yadong Qi Date: Fri, 9 Sep 2022 11:33:44 +0800 Subject: [PATCH] Move android binaries to vendor partition Move android binaries to vendor partition Tracked-On: OAM-103852 Signed-off-by: Yadong Qi --- src/android/applauncher/Android.bp | 2 ++ src/android/applauncher/civ_applauncher.cc | 2 +- src/android/powerctl/Android.bp | 2 ++ src/android/startup_notify/Android.bp | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/android/applauncher/Android.bp b/src/android/applauncher/Android.bp index c82f4a89..ac37a15e 100644 --- a/src/android/applauncher/Android.bp +++ b/src/android/applauncher/Android.bp @@ -53,6 +53,8 @@ cc_binary { "civ_applauncher.cc" ], + vendor: true, + include_dirs: INCLUDE_DIR, cflags: CFLAGS, diff --git a/src/android/applauncher/civ_applauncher.cc b/src/android/applauncher/civ_applauncher.cc index 47e01ba1..f78c05a9 100644 --- a/src/android/applauncher/civ_applauncher.cc +++ b/src/android/applauncher/civ_applauncher.cc @@ -31,7 +31,7 @@ class CivAppLauncherImpl final : public vm_manager::CivAppLauncher::Service { grpc::Status LaunchApp(grpc::ServerContext* ctx, const vm_manager::AppLaunchRequest* request, vm_manager::AppLaunchResponse* respond) override { ALOG("Launch APP: %s, Disp id: %u\n", request->app_name().c_str(), request->disp_id()); - std::string cmd("/system/bin/am start -n " + request->app_name() + " --display " + std::to_string(request->disp_id())); + std::string cmd("/system/bin/cmd activity start -n " + request->app_name() + " --display " + std::to_string(request->disp_id())); if (system(cmd.c_str())) { respond->set_code(-1); respond->set_status(vm_manager::AppStatus::FAILED); diff --git a/src/android/powerctl/Android.bp b/src/android/powerctl/Android.bp index e5fa7082..3c7407e4 100644 --- a/src/android/powerctl/Android.bp +++ b/src/android/powerctl/Android.bp @@ -53,6 +53,8 @@ cc_binary { "civ_powerctl.cc" ], + vendor: true, + include_dirs: INCLUDE_DIR, cflags: CFLAGS, diff --git a/src/android/startup_notify/Android.bp b/src/android/startup_notify/Android.bp index ef4495b2..d0e2ff97 100644 --- a/src/android/startup_notify/Android.bp +++ b/src/android/startup_notify/Android.bp @@ -53,6 +53,8 @@ cc_binary { "civ_startup_notify.cc" ], + vendor: true, + include_dirs: INCLUDE_DIR, cflags: CFLAGS,