Refactor directories in statsd
Bug: 167962588
Test: TH
Change-Id: Ie400fb24add9bb05c3f258a27e73634b6ed3ca81
Merged-In: Ie400fb24add9bb05c3f258a27e73634b6ed3ca81
diff --git a/apex/aidl/Android.bp b/aidl/Android.bp
similarity index 100%
rename from apex/aidl/Android.bp
rename to aidl/Android.bp
diff --git a/apex/aidl/android/os/IPendingIntentRef.aidl b/aidl/android/os/IPendingIntentRef.aidl
similarity index 100%
rename from apex/aidl/android/os/IPendingIntentRef.aidl
rename to aidl/android/os/IPendingIntentRef.aidl
diff --git a/apex/aidl/android/os/IPullAtomCallback.aidl b/aidl/android/os/IPullAtomCallback.aidl
similarity index 100%
rename from apex/aidl/android/os/IPullAtomCallback.aidl
rename to aidl/android/os/IPullAtomCallback.aidl
diff --git a/apex/aidl/android/os/IPullAtomResultReceiver.aidl b/aidl/android/os/IPullAtomResultReceiver.aidl
similarity index 100%
rename from apex/aidl/android/os/IPullAtomResultReceiver.aidl
rename to aidl/android/os/IPullAtomResultReceiver.aidl
diff --git a/apex/aidl/android/os/IStatsCompanionService.aidl b/aidl/android/os/IStatsCompanionService.aidl
similarity index 100%
rename from apex/aidl/android/os/IStatsCompanionService.aidl
rename to aidl/android/os/IStatsCompanionService.aidl
diff --git a/apex/aidl/android/os/IStatsManagerService.aidl b/aidl/android/os/IStatsManagerService.aidl
similarity index 100%
rename from apex/aidl/android/os/IStatsManagerService.aidl
rename to aidl/android/os/IStatsManagerService.aidl
diff --git a/apex/aidl/android/os/IStatsd.aidl b/aidl/android/os/IStatsd.aidl
similarity index 100%
rename from apex/aidl/android/os/IStatsd.aidl
rename to aidl/android/os/IStatsd.aidl
diff --git a/apex/aidl/android/os/StatsDimensionsValueParcel.aidl b/aidl/android/os/StatsDimensionsValueParcel.aidl
similarity index 100%
rename from apex/aidl/android/os/StatsDimensionsValueParcel.aidl
rename to aidl/android/os/StatsDimensionsValueParcel.aidl
diff --git a/apex/aidl/android/util/StatsEventParcel.aidl b/aidl/android/util/StatsEventParcel.aidl
similarity index 100%
rename from apex/aidl/android/util/StatsEventParcel.aidl
rename to aidl/android/util/StatsEventParcel.aidl
diff --git a/apex/Android.bp b/apex/Android.bp
index f13861e..9fb2a88 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -60,24 +60,3 @@
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",
- ],
-}
diff --git a/apex/framework/Android.bp b/framework/Android.bp
similarity index 76%
rename from apex/framework/Android.bp
rename to framework/Android.bp
index e4299f5..59fd9c2 100644
--- a/apex/framework/Android.bp
+++ b/framework/Android.bp
@@ -45,7 +45,7 @@
visibility: [
"//frameworks/base", // For the "global" stubs.
"//frameworks/base/apex/statsd:__subpackages__",
- "//packages/modules/StatsD/apex:__subpackages__",
+ "//packages/modules/StatsD/framework:__subpackages__",
],
}
java_sdk_library {
@@ -75,7 +75,7 @@
impl_library_visibility: [
"//frameworks/base/apex/statsd/framework/test:__subpackages__",
- "//packages/modules/StatsD/apex/framework/test:__subpackages__",
+ "//packages/modules/StatsD/framework/test:__subpackages__",
],
apex_available: [
@@ -83,3 +83,29 @@
"test_com.android.os.statsd",
],
}
+
+// 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",
+ ],
+ visibility: [
+ "//packages/modules/StatsD/apex:__subpackages__",
+ ],
+}
+
diff --git a/apex/framework/api/current.txt b/framework/api/current.txt
similarity index 100%
rename from apex/framework/api/current.txt
rename to framework/api/current.txt
diff --git a/apex/framework/api/module-lib-current.txt b/framework/api/module-lib-current.txt
similarity index 100%
rename from apex/framework/api/module-lib-current.txt
rename to framework/api/module-lib-current.txt
diff --git a/apex/framework/api/module-lib-removed.txt b/framework/api/module-lib-removed.txt
similarity index 100%
rename from apex/framework/api/module-lib-removed.txt
rename to framework/api/module-lib-removed.txt
diff --git a/apex/framework/api/removed.txt b/framework/api/removed.txt
similarity index 100%
rename from apex/framework/api/removed.txt
rename to framework/api/removed.txt
diff --git a/apex/framework/api/system-current.txt b/framework/api/system-current.txt
similarity index 100%
rename from apex/framework/api/system-current.txt
rename to framework/api/system-current.txt
diff --git a/apex/framework/api/system-removed.txt b/framework/api/system-removed.txt
similarity index 100%
rename from apex/framework/api/system-removed.txt
rename to framework/api/system-removed.txt
diff --git a/apex/framework/java/android/app/StatsManager.java b/framework/java/android/app/StatsManager.java
similarity index 100%
rename from apex/framework/java/android/app/StatsManager.java
rename to framework/java/android/app/StatsManager.java
diff --git a/apex/framework/java/android/os/StatsDimensionsValue.java b/framework/java/android/os/StatsDimensionsValue.java
similarity index 100%
rename from apex/framework/java/android/os/StatsDimensionsValue.java
rename to framework/java/android/os/StatsDimensionsValue.java
diff --git a/apex/framework/java/android/os/StatsFrameworkInitializer.java b/framework/java/android/os/StatsFrameworkInitializer.java
similarity index 100%
rename from apex/framework/java/android/os/StatsFrameworkInitializer.java
rename to framework/java/android/os/StatsFrameworkInitializer.java
diff --git a/apex/framework/java/android/util/StatsEvent.java b/framework/java/android/util/StatsEvent.java
similarity index 100%
rename from apex/framework/java/android/util/StatsEvent.java
rename to framework/java/android/util/StatsEvent.java
diff --git a/apex/framework/java/android/util/StatsLog.java b/framework/java/android/util/StatsLog.java
similarity index 100%
rename from apex/framework/java/android/util/StatsLog.java
rename to framework/java/android/util/StatsLog.java
diff --git a/apex/jni/android_util_StatsLog.cpp b/framework/jni/android_util_StatsLog.cpp
similarity index 100%
rename from apex/jni/android_util_StatsLog.cpp
rename to framework/jni/android_util_StatsLog.cpp
diff --git a/apex/framework/test/Android.bp b/framework/test/Android.bp
similarity index 100%
rename from apex/framework/test/Android.bp
rename to framework/test/Android.bp
diff --git a/apex/framework/test/AndroidManifest.xml b/framework/test/AndroidManifest.xml
similarity index 100%
rename from apex/framework/test/AndroidManifest.xml
rename to framework/test/AndroidManifest.xml
diff --git a/apex/framework/test/AndroidTest.xml b/framework/test/AndroidTest.xml
similarity index 100%
rename from apex/framework/test/AndroidTest.xml
rename to framework/test/AndroidTest.xml
diff --git a/apex/framework/test/src/android/app/PullAtomMetadataTest.java b/framework/test/src/android/app/PullAtomMetadataTest.java
similarity index 100%
rename from apex/framework/test/src/android/app/PullAtomMetadataTest.java
rename to framework/test/src/android/app/PullAtomMetadataTest.java
diff --git a/apex/framework/test/src/android/os/StatsDimensionsValueTest.java b/framework/test/src/android/os/StatsDimensionsValueTest.java
similarity index 100%
rename from apex/framework/test/src/android/os/StatsDimensionsValueTest.java
rename to framework/test/src/android/os/StatsDimensionsValueTest.java
diff --git a/apex/framework/test/src/android/util/StatsEventTest.java b/framework/test/src/android/util/StatsEventTest.java
similarity index 100%
rename from apex/framework/test/src/android/util/StatsEventTest.java
rename to framework/test/src/android/util/StatsEventTest.java
diff --git a/apex/service/Android.bp b/service/Android.bp
similarity index 100%
rename from apex/service/Android.bp
rename to service/Android.bp
diff --git a/apex/service/java/com/android/server/stats/StatsCompanion.java b/service/java/com/android/server/stats/StatsCompanion.java
similarity index 100%
rename from apex/service/java/com/android/server/stats/StatsCompanion.java
rename to service/java/com/android/server/stats/StatsCompanion.java
diff --git a/apex/service/java/com/android/server/stats/StatsCompanionService.java b/service/java/com/android/server/stats/StatsCompanionService.java
similarity index 100%
rename from apex/service/java/com/android/server/stats/StatsCompanionService.java
rename to service/java/com/android/server/stats/StatsCompanionService.java
diff --git a/apex/service/java/com/android/server/stats/StatsManagerService.java b/service/java/com/android/server/stats/StatsManagerService.java
similarity index 100%
rename from apex/service/java/com/android/server/stats/StatsManagerService.java
rename to service/java/com/android/server/stats/StatsManagerService.java
