Add install test for statsd apex
Bug: 145960929
Test: atest statsd_e2e_tests --rebuild-module-info
Change-Id: I4d708a129476ba9dc631500a525f159c7676ef6c
diff --git a/apex/Android.bp b/apex/Android.bp
index d76a40e..8327f31 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -14,20 +14,19 @@
apex {
name: "com.android.os.statsd",
-
+ defaults: ["com.android.os.statsd-defaults"],
manifest: "apex_manifest.json",
- // optional. if unspecified, a default one is auto-generated
- //androidManifest: "AndroidManifest.xml",
+}
+
+apex_defaults {
// libc.so and libcutils.so are included in the apex
// native_shared_libs: ["libc", "libcutils"],
// binaries: ["vold"],
// java_libs: ["core-all"],
// prebuilts: ["my_prebuilt"],
-
- compile_multilib: "both",
-
+ name: "com.android.os.statsd-defaults",
key: "com.android.os.statsd.key",
certificate: ":com.android.os.statsd.certificate",
}
diff --git a/apex/testing/Android.bp b/apex/testing/Android.bp
new file mode 100644
index 0000000..22e7301
--- /dev/null
+++ b/apex/testing/Android.bp
@@ -0,0 +1,25 @@
+// 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.
+
+apex {
+ name: "test_com.android.os.statsd",
+ visibility: [
+ "//system/apex/tests",
+ ],
+ defaults: ["com.android.os.statsd-defaults"],
+ manifest: "test_manifest.json",
+ file_contexts: ":com.android.os.statsd-file_contexts",
+ // Test APEX, should never be installed
+ installable: false,
+}
diff --git a/apex/testing/test_manifest.json b/apex/testing/test_manifest.json
new file mode 100644
index 0000000..57343d3
--- /dev/null
+++ b/apex/testing/test_manifest.json
@@ -0,0 +1,4 @@
+{
+ "name": "com.android.os.statsd",
+ "version": 2147483647
+}
