Merge "Revert "Migrate Statsd to the apex""
diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index 2f3e2ac..86a3a7d 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -24,13 +24,13 @@
"libstatspull",
"libstatssocket",
],
- 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",
@@ -49,12 +49,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/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 73a8f66..4991a95 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -217,10 +217,7 @@
shared_libs: ["libgtest_prod"],
- apex_available: [
- "com.android.os.statsd",
- "test_com.android.os.statsd",
- ],
+ init_rc: ["statsd.rc"],
}
// ==============
diff --git a/apex/statsd/statsd.rc b/cmds/statsd/statsd.rc
similarity index 67%
rename from apex/statsd/statsd.rc
rename to cmds/statsd/statsd.rc
index 605da2a..a98ecd5 100644
--- a/apex/statsd/statsd.rc
+++ b/cmds/statsd/statsd.rc
@@ -12,9 +12,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-service statsd /apex/com.android.os.statsd/bin/statsd
+service statsd /system/bin/statsd
class main
socket statsdw dgram+passcred 0222 statsd statsd
user statsd
group statsd log
writepid /dev/cpuset/system-background/tasks
+
+on property:ro.statsd.enable=false
+ stop statsd
+
+on post-fs-data
+ # Create directory for statsd
+ mkdir /data/misc/stats-data/ 0770 statsd system
+ mkdir /data/misc/stats-service/ 0770 statsd system
+ mkdir /data/misc/stats-active-metric/ 0770 statsd system
+ mkdir /data/misc/train-info/ 0770 statsd system
diff --git a/services/core/java/com/android/server/Watchdog.java b/services/core/java/com/android/server/Watchdog.java
index 8900eee..a1ccd84 100644
--- a/services/core/java/com/android/server/Watchdog.java
+++ b/services/core/java/com/android/server/Watchdog.java
@@ -100,7 +100,7 @@
"media.codec", // vendor/bin/hw/android.hardware.media.omx@1.0-service
"media.swcodec", // /apex/com.android.media.swcodec/bin/mediaswcodec
"com.android.bluetooth", // Bluetooth service
- "/apex/com.android.os.statsd/bin/statsd", // Stats daemon
+ "/system/bin/statsd", // Stats daemon
};
public static final List<String> HAL_INTERFACES_OF_INTEREST = Arrays.asList(