Skip to content
Snippets Groups Projects
Commit 2303a59d authored by Yimin Li's avatar Yimin Li
Browse files

Merge commit '8a29b389' of... 

Merge commit '8a29b389' of sso://googleplex-android/platform/prebuilts/module_sdk/StatsD into HEAD

Change-Id: I4135f605ec48aa7897dfec493864b76c021c2a34
parents 1cc55871 8a29b389
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+ 2
− 2
View file @ 2303a59d
drops {
android_build_drop {
build_id: "T1004275"
build_id: "T1004707"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip"
}
......@@ -8,7 +8,7 @@ drops {
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/StatsD"
git_branch: "tm-dev"
git_branch: "tm-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
......
current/Android.bp
+ 15
− 177
View file @ 2303a59d
// This is auto-generated. DO NOT EDIT.
// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
soong_config_module_type_import {
from: "packages/modules/common/Android.bp",
module_types: [
"module_cc_prebuilt_library_shared",
"module_java_import",
"module_java_sdk_library_import",
"module_prebuilt_bootclasspath_fragment",
"module_prebuilt_systemserverclasspath_fragment",
],
}
package {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
......@@ -19,37 +7,11 @@ package {
}
prebuilt_bootclasspath_fragment {
name: "statsd-module-sdk_com.android.os.statsd-bootclasspath-fragment@current",
sdk_member_name: "com.android.os.statsd-bootclasspath-fragment",
visibility: ["//visibility:public"],
apex_available: ["com.android.os.statsd"],
licenses: ["statsd-module-sdk_Android-Apache-2.0@current"],
contents: ["statsd-module-sdk_framework-statsd@current"],
fragments: [
{
apex: "com.android.art",
module: "art-bootclasspath-fragment",
},
],
hidden_api: {
max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
annotation_flags: "hiddenapi/annotation-flags.csv",
metadata: "hiddenapi/metadata.csv",
index: "hiddenapi/index.csv",
signature_patterns: "hiddenapi/signature-patterns.csv",
filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
filtered_flags: "hiddenapi/filtered-flags.csv",
},
}
module_prebuilt_bootclasspath_fragment {
name: "com.android.os.statsd-bootclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
prefer: true,
soong_config_variables: {
module_build_from_source: {
prefer: false,
},
use_source_config_var: {
config_namespace: "ANDROID",
var_name: "module_build_from_source",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.os.statsd"],
......@@ -73,55 +35,11 @@ module_prebuilt_bootclasspath_fragment {
}
java_sdk_library_import {
name: "statsd-module-sdk_framework-statsd@current",
sdk_member_name: "framework-statsd",
visibility: ["//visibility:public"],
apex_available: [
"com.android.os.statsd",
"test_com.android.os.statsd",
],
licenses: ["statsd-module-sdk_Android-Apache-2.0@current"],
shared_library: false,
permitted_packages: [
"android.app",
"android.os",
"android.util",
"com.android.internal.statsd",
],
public: {
jars: ["sdk_library/public/framework-statsd-stubs.jar"],
stub_srcs: ["sdk_library/public/framework-statsd.srcjar"],
current_api: "sdk_library/public/framework-statsd.txt",
removed_api: "sdk_library/public/framework-statsd-removed.txt",
annotations: "sdk_library/public/framework-statsd_annotations.zip",
sdk_version: "module_current",
},
system: {
jars: ["sdk_library/system/framework-statsd-stubs.jar"],
stub_srcs: ["sdk_library/system/framework-statsd.srcjar"],
current_api: "sdk_library/system/framework-statsd.txt",
removed_api: "sdk_library/system/framework-statsd-removed.txt",
annotations: "sdk_library/system/framework-statsd_annotations.zip",
sdk_version: "module_current",
},
module_lib: {
jars: ["sdk_library/module-lib/framework-statsd-stubs.jar"],
stub_srcs: ["sdk_library/module-lib/framework-statsd.srcjar"],
current_api: "sdk_library/module-lib/framework-statsd.txt",
removed_api: "sdk_library/module-lib/framework-statsd-removed.txt",
annotations: "sdk_library/module-lib/framework-statsd_annotations.zip",
sdk_version: "module_current",
},
}
module_java_sdk_library_import {
name: "framework-statsd",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
prefer: true,
soong_config_variables: {
module_build_from_source: {
prefer: false,
},
use_source_config_var: {
config_namespace: "ANDROID",
var_name: "module_build_from_source",
},
visibility: ["//visibility:public"],
apex_available: [
......@@ -163,25 +81,11 @@ module_java_sdk_library_import {
}
java_import {
name: "statsd-module-sdk_service-statsd@current",
sdk_member_name: "service-statsd",
visibility: ["//visibility:public"],
apex_available: [
"com.android.os.statsd",
"test_com.android.os.statsd",
],
licenses: ["statsd-module-sdk_Android-Apache-2.0@current"],
jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-statsd.jar"],
}
module_java_import {
name: "service-statsd",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
prefer: true,
soong_config_variables: {
module_build_from_source: {
prefer: false,
},
use_source_config_var: {
config_namespace: "ANDROID",
var_name: "module_build_from_source",
},
visibility: ["//visibility:public"],
apex_available: [
......@@ -192,14 +96,6 @@ module_java_import {
jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-statsd.jar"],
}
license {
name: "statsd-module-sdk_Android-Apache-2.0@current",
sdk_member_name: "Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
license_text: ["licenses/build/soong/licenses/LICENSE"],
}
license {
name: "statsd-module-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"],
......@@ -208,48 +104,11 @@ license {
}
cc_prebuilt_library_shared {
name: "statsd-module-sdk_libstatssocket@current",
sdk_member_name: "libstatssocket",
visibility: ["//visibility:public"],
apex_available: [
"com.android.os.statsd",
"test_com.android.os.statsd",
],
licenses: ["statsd-module-sdk_Android-Apache-2.0@current"],
installable: false,
stl: "libc++_static",
compile_multilib: "both",
export_include_dirs: ["include/packages/modules/StatsD/lib/libstatssocket/include"],
stubs: {
versions: [
"30",
"current",
],
},
arch: {
arm64: {
srcs: ["arm64/lib/libstatssocket.so"],
},
x86_64: {
srcs: ["x86_64/lib/libstatssocket.so"],
},
arm: {
srcs: ["arm/lib/libstatssocket.so"],
},
x86: {
srcs: ["x86/lib/libstatssocket.so"],
},
},
}
module_cc_prebuilt_library_shared {
name: "libstatssocket",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
prefer: true,
soong_config_variables: {
module_build_from_source: {
prefer: false,
},
use_source_config_var: {
config_namespace: "ANDROID",
var_name: "module_build_from_source",
},
visibility: ["//visibility:public"],
apex_available: [
......@@ -283,35 +142,14 @@ module_cc_prebuilt_library_shared {
}
prebuilt_systemserverclasspath_fragment {
name: "statsd-module-sdk_com.android.os.statsd-systemserverclasspath-fragment@current",
sdk_member_name: "com.android.os.statsd-systemserverclasspath-fragment",
visibility: ["//visibility:public"],
apex_available: ["com.android.os.statsd"],
licenses: ["statsd-module-sdk_Android-Apache-2.0@current"],
standalone_contents: ["statsd-module-sdk_service-statsd@current"],
}
module_prebuilt_systemserverclasspath_fragment {
name: "com.android.os.statsd-systemserverclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
prefer: true,
soong_config_variables: {
module_build_from_source: {
prefer: false,
},
use_source_config_var: {
config_namespace: "ANDROID",
var_name: "module_build_from_source",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.os.statsd"],
licenses: ["statsd-module-sdk_Android-Apache-2.0"],
standalone_contents: ["service-statsd"],
}
sdk_snapshot {
name: "statsd-module-sdk@current",
visibility: ["//visibility:public"],
bootclasspath_fragments: ["statsd-module-sdk_com.android.os.statsd-bootclasspath-fragment@current"],
java_sdk_libs: ["statsd-module-sdk_framework-statsd@current"],
java_systemserver_libs: ["statsd-module-sdk_service-statsd@current"],
native_shared_libs: ["statsd-module-sdk_libstatssocket@current"],
systemserverclasspath_fragments: ["statsd-module-sdk_com.android.os.statsd-systemserverclasspath-fragment@current"],
}
current/snapshot-creation-build-number.txt
+ 1
− 1
View file @ 2303a59d
8762343
\ No newline at end of file
8892762
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment