Revert "Migrate Statsd to the apex"
Revert "Update statsd binary path for apex"
Revert submission 10356003-statsd_apex
Reason for revert: https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=build_test&lkgb=6221366&fkbb=6221428
Reverted Changes:
Ic84e77269:Update init.rc for statsd setup
I6f3fab4b4:Update statsd binary path for apex
Ib4ea98aed:Migrate Statsd to the apex
Change-Id: I089d5b9bbbdc363e27e79e4addd4eec1e4339c48
diff --git a/apex/Android.bp b/apex/Android.bp
index 3b19692..0e93110 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -22,13 +22,13 @@
native_shared_libs: [
"libstats_jni",
],
- binaries: ["statsd"],
+ // binaries: ["vold"],
java_libs: [
"framework-statsd",
"service-statsd",
],
compile_multilib: "both",
- prebuilts: ["com.android.os.statsd.init.rc"],
+ // prebuilts: ["my_prebuilt"],
name: "com.android.os.statsd-defaults",
key: "com.android.os.statsd.key",
certificate: ":com.android.os.statsd.certificate",
@@ -47,12 +47,6 @@
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 {
diff --git a/apex/statsd.rc b/apex/statsd.rc
deleted file mode 100644
index 605da2a..0000000
--- a/apex/statsd.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2017 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.
-
-service statsd /apex/com.android.os.statsd/bin/statsd
- class main
- socket statsdw dgram+passcred 0222 statsd statsd
- user statsd
- group statsd log
- writepid /dev/cpuset/system-background/tasks