From 67ec8ae5a799a23852ee5e9802dbbbdd0c6a41a3 Mon Sep 17 00:00:00 2001 From: Ruchit Marathe Date: Sun, 1 Jan 2023 18:34:47 +0530 Subject: [PATCH] sm7125: Properly build memtrack --- aidl/memtrack/Android.bp | 30 -------------------- aidl/memtrack/Memtrack.cpp | 47 ------------------------------- aidl/memtrack/Memtrack.h | 39 ------------------------- aidl/memtrack/main.cpp | 36 ----------------------- aidl/memtrack/memtrack-sm7125.rc | 4 --- aidl/memtrack/memtrack-sm7125.xml | 7 ----- common.mk | 3 +- configs/manifest.xml | 10 +++++++ 8 files changed, 12 insertions(+), 164 deletions(-) delete mode 100755 aidl/memtrack/Android.bp delete mode 100755 aidl/memtrack/Memtrack.cpp delete mode 100755 aidl/memtrack/Memtrack.h delete mode 100755 aidl/memtrack/main.cpp delete mode 100755 aidl/memtrack/memtrack-sm7125.rc delete mode 100755 aidl/memtrack/memtrack-sm7125.xml diff --git a/aidl/memtrack/Android.bp b/aidl/memtrack/Android.bp deleted file mode 100755 index 58116a8..0000000 --- a/aidl/memtrack/Android.bp +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (C) 2020 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -cc_binary { - name: "android.hardware.memtrack-service.s", - relative_install_path: "hw", - init_rc: ["memtrack-sm7125.rc"], - vintf_fragments: ["memtrack-sm7125.xml"], - vendor: true, - shared_libs: [ - "libbase", - "libbinder_ndk", - "android.hardware.memtrack-V1-ndk", - ], - srcs: [ - "main.cpp", - "Memtrack.cpp", - ], -} diff --git a/aidl/memtrack/Memtrack.cpp b/aidl/memtrack/Memtrack.cpp deleted file mode 100755 index 49a6582..0000000 --- a/aidl/memtrack/Memtrack.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "Memtrack.h" - -namespace aidl { -namespace android { -namespace hardware { -namespace memtrack { - -ndk::ScopedAStatus Memtrack::getMemory(int pid, MemtrackType type, - std::vector* _aidl_return) { - if (pid < 0) { - return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_ILLEGAL_ARGUMENT)); - } - if (type != MemtrackType::OTHER && type != MemtrackType::GL && type != MemtrackType::GRAPHICS && - type != MemtrackType::MULTIMEDIA && type != MemtrackType::CAMERA) { - return ndk::ScopedAStatus(AStatus_fromExceptionCode(EX_UNSUPPORTED_OPERATION)); - } - _aidl_return->clear(); - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus Memtrack::getGpuDeviceInfo(std::vector* _aidl_return) { - _aidl_return->clear(); - DeviceInfo dev_info = {.id = 0, .name = "virtio_gpu"}; - _aidl_return->emplace_back(dev_info); - return ndk::ScopedAStatus::ok(); -} - -} // namespace memtrack -} // namespace hardware -} // namespace android -} // namespace aidl diff --git a/aidl/memtrack/Memtrack.h b/aidl/memtrack/Memtrack.h deleted file mode 100755 index f2ef60e..0000000 --- a/aidl/memtrack/Memtrack.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include -#include -#include - -namespace aidl { -namespace android { -namespace hardware { -namespace memtrack { - -class Memtrack : public BnMemtrack { - ndk::ScopedAStatus getMemory(int pid, MemtrackType type, - std::vector* _aidl_return) override; - - ndk::ScopedAStatus getGpuDeviceInfo(std::vector* _aidl_return) override; -}; - -} // namespace memtrack -} // namespace hardware -} // namespace android -} // namespace aidl diff --git a/aidl/memtrack/main.cpp b/aidl/memtrack/main.cpp deleted file mode 100755 index 5cf5f94..0000000 --- a/aidl/memtrack/main.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "Memtrack.h" - -#include -#include -#include - -using aidl::android::hardware::memtrack::Memtrack; - -int main() { - ABinderProcess_setThreadPoolMaxThreadCount(0); - std::shared_ptr memtrack = ndk::SharedRefBase::make(); - - const std::string instance = std::string() + Memtrack::descriptor + "/default"; - binder_status_t status = - AServiceManager_addService(memtrack->asBinder().get(), instance.c_str()); - CHECK_EQ(status, STATUS_OK); - - ABinderProcess_joinThreadPool(); - return EXIT_FAILURE; // Unreachable -} diff --git a/aidl/memtrack/memtrack-sm7125.rc b/aidl/memtrack/memtrack-sm7125.rc deleted file mode 100755 index f3427e2..0000000 --- a/aidl/memtrack/memtrack-sm7125.rc +++ /dev/null @@ -1,4 +0,0 @@ -service vendor.memtrack-default /vendor/bin/hw/android.hardware.memtrack-service.sm7125 - class hal - user nobody - group system diff --git a/aidl/memtrack/memtrack-sm7125.xml b/aidl/memtrack/memtrack-sm7125.xml deleted file mode 100755 index 3e3e0f6..0000000 --- a/aidl/memtrack/memtrack-sm7125.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - android.hardware.memtrack - IMemtrack/default - - - diff --git a/common.mk b/common.mk index 3bbe7b6..9b78764 100644 --- a/common.mk +++ b/common.mk @@ -152,7 +152,8 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.mapper@3.0-impl-qti-display \ android.hardware.graphics.mapper@4.0-impl-qti-display \ vendor.qti.hardware.display.allocator-service \ - android.hardware.memtrack-service.sm7125 \ + android.hardware.memtrack@1.0-impl \ + android.hardware.memtrack@1.0-service \ android.hardware.renderscript@1.0-impl \ libtinyxml \ libtinyxml2 \ diff --git a/configs/manifest.xml b/configs/manifest.xml index 766cc12..48e57d1 100644 --- a/configs/manifest.xml +++ b/configs/manifest.xml @@ -83,6 +83,16 @@ @1.0::IOmx/default @1.0::IOmxStore/default + + android.hardware.memtrack + hwbinder + 1.0 + + IMemtrack + default + + @1.0::IMemtrack/default + android.hardware.radio hwbinder