Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 599aeb98 authored by Baligh Uddin's avatar Baligh Uddin
Browse files

Migrate apex/statsd -> packages/modules/StatsD/apex

BUG: 167962588
TEST: TH
Merged-In: Ifee35a00de64e194abb80af5d85e34732244f509
Change-Id: I29efe91c4d9e0b34e05bdcc54fc1e3ad575b9ece
parent 3001a82d
Loading
Loading
Loading
Loading

apex/statsd/.clang-format

deleted100644 → 0
+0 −17
Original line number Original line Diff line number Diff line
BasedOnStyle: Google
AllowShortIfStatementsOnASingleLine: true
AllowShortFunctionsOnASingleLine: false
AllowShortLoopsOnASingleLine: true
BinPackArguments: true
BinPackParameters: true
ColumnLimit: 100
CommentPragmas: NOLINT:.*
ContinuationIndentWidth: 8
DerivePointerAlignment: false
IndentWidth: 4
PointerAlignment: Left
TabWidth: 4
AccessModifierOffset: -4
IncludeCategories:
  - Regex:    '^"Log\.h"'
    Priority:    -1

apex/statsd/Android.bp

deleted100644 → 0
+0 −81
Original line number Original line Diff line number Diff line
// Copyright (C) 2019 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.

apex {
    name: "com.android.os.statsd",
    defaults: ["com.android.os.statsd-defaults"],
    manifest: "apex_manifest.json",
}

apex_defaults {
    native_shared_libs: [
        "libstats_jni",
        "libstatspull",
        "libstatssocket",
    ],
    binaries: ["statsd"],
    java_libs: [
        "framework-statsd",
        "service-statsd",
    ],
    compile_multilib: "both",
    prebuilts: ["com.android.os.statsd.init.rc"],
    name: "com.android.os.statsd-defaults",
    updatable: true,
    min_sdk_version: "30",
    key: "com.android.os.statsd.key",
    certificate: ":com.android.os.statsd.certificate",
}

apex_key {
    name: "com.android.os.statsd.key",
    public_key: "com.android.os.statsd.avbpubkey",
    private_key: "com.android.os.statsd.pem",
}

android_app_certificate {
    name: "com.android.os.statsd.certificate",
    // This will use com.android.os.statsd.x509.pem (the cert) and
    // com.android.os.statsd.pk8 (the private key)
    certificate: "com.android.os.statsd",
}

prebuilt_etc {
    name: "com.android.os.statsd.init.rc",
    src: "statsd.rc",
    filename: "init.rc",
    installable: false,
}

// JNI library for StatsLog.write
cc_library_shared {
    name: "libstats_jni",
    srcs: ["jni/**/*.cpp"],
    header_libs: ["libnativehelper_header_only"],
    shared_libs: [
        "liblog",  // Has a stable abi - should not be copied into apex.
        "libstatssocket",
    ],
    stl: "libc++_static",
    cflags: [
        "-Wall",
        "-Werror",
        "-Wextra",
        "-Wno-unused-parameter",
    ],
    apex_available: [
        "com.android.os.statsd",
        "test_com.android.os.statsd",
    ],
}

apex/statsd/OWNERS

deleted100644 → 0
+0 −9
Original line number Original line Diff line number Diff line
jeffreyhuang@google.com
joeo@google.com
jtnguyen@google.com
muhammadq@google.com
ruchirr@google.com
singhtejinder@google.com
tsaichristine@google.com
yaochen@google.com
yro@google.com
 No newline at end of file

apex/statsd/TEST_MAPPING

deleted100644 → 0
+0 −10
Original line number Original line Diff line number Diff line
{
  "presubmit" : [
    {
      "name" : "FrameworkStatsdTest"
    },
    {
      "name" : "LibStatsPullTests"
    }
  ]
}

apex/statsd/aidl/Android.bp

deleted100644 → 0
+0 −51
Original line number Original line Diff line number Diff line
//
// Copyright (C) 2019 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.
//
filegroup {
    name: "framework-statsd-aidl-sources",
    srcs: ["**/*.aidl"],
}

aidl_interface {
    name: "statsd-aidl",
    unstable: true,
    srcs: [
        "android/os/IPendingIntentRef.aidl",
        "android/os/IPullAtomCallback.aidl",
        "android/os/IPullAtomResultReceiver.aidl",
        "android/os/IStatsCompanionService.aidl",
        "android/os/IStatsd.aidl",
        "android/os/StatsDimensionsValueParcel.aidl",
        "android/util/StatsEventParcel.aidl",
    ],
    backend: {
        java: {
            enabled: false, // framework-statsd and service-statsd use framework-statsd-aidl-sources
        },
        cpp: {
            enabled: false,
        },
        ndk: {
            enabled: true,
            apex_available: [
                // TODO(b/145923087): Remove this once statsd binary is in apex
                "//apex_available:platform",

                "com.android.os.statsd",
                "test_com.android.os.statsd",
            ],
        },
    }
}
Loading