diff options
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | apex/statsd/Android.bp | 5 | ||||
| -rw-r--r-- | apex/statsd/framework/Android.bp | 67 | ||||
| -rw-r--r-- | apex/statsd/framework/java/android/util/StatsEvent.java (renamed from core/java/android/util/StatsEvent.java) | 0 | ||||
| -rw-r--r-- | core/jni/fd_utils.cpp | 1 |
5 files changed, 79 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 3308768aa8c7..a26135e8b950 100644 --- a/Android.bp +++ b/Android.bp @@ -288,6 +288,7 @@ filegroup { name: "framework-updatable-sources", srcs: [ ":framework-sdkext-sources", + ":framework-statsd-sources", ":updatable-media-srcs", ] } @@ -449,6 +450,10 @@ java_library { name: "framework-minus-apex", defaults: ["framework-defaults"], srcs: [":framework-non-updatable-sources"], + libs: [ + // TODO(b/146167933): Use framework-statsd-stubs + "framework-statsd", + ], installable: true, javac_shard_size: 150, required: [ @@ -485,6 +490,8 @@ java_library { static_libs: [ "framework-minus-apex", "framework-sdkext-stubs-systemapi", + // TODO(b/146167933): Use framework-statsd-stubs instead. + "framework-statsd", // TODO(jiyong): add more stubs for APEXes here ], sdk_version: "core_platform", diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp index 5c46e1f22527..09ca1d257460 100644 --- a/apex/statsd/Android.bp +++ b/apex/statsd/Android.bp @@ -22,7 +22,10 @@ apex_defaults { // libc.so and libcutils.so are included in the apex // native_shared_libs: ["libc", "libcutils"], // binaries: ["vold"], - java_libs: ["service-statsd"], + java_libs: [ + "framework-statsd", + "service-statsd", + ], // prebuilts: ["my_prebuilt"], name: "com.android.os.statsd-defaults", key: "com.android.os.statsd.key", diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp new file mode 100644 index 000000000000..37b07a6380aa --- /dev/null +++ b/apex/statsd/framework/Android.bp @@ -0,0 +1,67 @@ +// 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-sources", + srcs: [ + "java/**/*.java", + ], + path: "java", +} + +java_library { + name: "framework-statsd", + installable: true, + // TODO(b/146209659): Use system_current instead. + sdk_version: "core_platform", + srcs: [ + ":framework-statsd-sources", + ], + permitted_packages: [ + "android.app", + "android.util", + ], + libs: [ + "framework-annotations-lib", + // TODO(b/146230220): Use framework-system-stubs instead. + "android_system_stubs_current", + ], + // TODO:(b/146210774): Add apex_available field. +} + +droidstubs { + name: "framework-statsd-stubs-docs", + defaults: [ + "framework-module-stubs-defaults-publicapi" + ], + srcs: [ + ":framework-statsd-sources", + ], + libs: [ + "framework-all", + ], + sdk_version: "core_platform", +} + +// TODO(b/146167933): Use these stubs in frameworks/base/Android.bp +java_library { + name: "framework-statsd-stubs", + srcs: [ + ":framework-statsd-stubs-docs", + ], + libs: [ + "framework-all", + ], + sdk_version: "core_platform", +} diff --git a/core/java/android/util/StatsEvent.java b/apex/statsd/framework/java/android/util/StatsEvent.java index c7659457bdf9..c7659457bdf9 100644 --- a/core/java/android/util/StatsEvent.java +++ b/apex/statsd/framework/java/android/util/StatsEvent.java diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp index 0c21076065d5..4733048c0639 100644 --- a/core/jni/fd_utils.cpp +++ b/core/jni/fd_utils.cpp @@ -36,6 +36,7 @@ static const char* kPathWhitelist[] = { "/apex/com.android.conscrypt/javalib/conscrypt.jar", "/apex/com.android.ipsec/javalib/ike.jar", "/apex/com.android.media/javalib/updatable-media.jar", + "/apex/com.android.os.statsd/javalib/framework-statsd.jar", "/apex/com.android.sdkext/javalib/framework-sdkext.jar", "/apex/com.android.telephony/javalib/telephony-common.jar", "/apex/com.android.telephony/javalib/ims-common.jar", |