Create a cellbroadcast apex

create a single com.android.cellbroadcast apex to pack two apks
together: com.android.cellbroadcastreceiver and
com.android.cellbroadcastservice.

Bug: 135956699
Test: m com.android.cellbroadcast && adb install
com.android.cellbroadcast

Change-Id: Ib7bc345a6caebcbdaf032c54f04f04a8221295f3

8 files changed, 142 insertions, 0 deletions

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 58a9a496a..43988c32d 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -46,6 +46,8 @@
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/CellBroadcastReceiver)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/CellBroadcastAppPlatform)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/CellBroadcastApp)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/apex/Android.bp b/apex/Android.bp
new file mode 100644
index 000000000..8e71cf0d9
--- /dev/null
+++ b/apex/Android.bp
@@ -0,0 +1,24 @@
+apex {
+    name: "com.android.cellbroadcast",
+
+    manifest: "apex_manifest.json",
+
+    // optional. if unspecified, a default one is auto-generated
+    androidManifest: "AndroidManifest.xml",
+
+    apps: ["CellBroadcastApp", "CellBroadcastServiceModule"],
+
+    key: "com.android.cellbroadcast.key",
+    certificate: ":com.android.cellbroadcast.certificate",
+}
+
+apex_key {
+    name: "com.android.cellbroadcast.key",
+    public_key: "com.android.cellbroadcast.avbpubkey",
+    private_key: "com.android.cellbroadcast.pem",
+}
+
+android_app_certificate {
+    name: "com.android.cellbroadcast.certificate",
+    certificate: "com.android.cellbroadcast",
+}
diff --git a/apex/AndroidManifest.xml b/apex/AndroidManifest.xml
new file mode 100644
index 000000000..f6ed80f8d
--- /dev/null
+++ b/apex/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * 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.
+ -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.cellbroadcast">
+    <!-- APEX does not have classes.dex -->
+    <application android:hasCode="false" />
+    <!-- Setting maxSdk to lock the module to R. minSdk is auto-set by build system -->
+    <uses-sdk
+        android:maxSdkVersion="30"
+        android:targetSdkVersion="30"
+    />
+</manifest>
\ No newline at end of file
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
new file mode 100644
index 000000000..c93647458
--- /dev/null
+++ b/apex/apex_manifest.json
@@ -0,0 +1,4 @@
+{
+  "name": "com.android.cellbroadcast",
+  "version": 300000000
+}
\ No newline at end of file
diff --git a/apex/com.android.cellbroadcast.avbpubkey b/apex/com.android.cellbroadcast.avbpubkey
new file mode 100644
index 000000000..a7f87c334
--- /dev/null
+++ b/apex/com.android.cellbroadcast.avbpubkey
diff --git a/apex/com.android.cellbroadcast.pem b/apex/com.android.cellbroadcast.pem
new file mode 100644
index 000000000..41fa08162
--- /dev/null
+++ b/apex/com.android.cellbroadcast.pem
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/apex/com.android.cellbroadcast.pk8 b/apex/com.android.cellbroadcast.pk8
new file mode 100644
index 000000000..31af34bfd
--- /dev/null
+++ b/apex/com.android.cellbroadcast.pk8
diff --git a/apex/com.android.cellbroadcast.x509.pem b/apex/com.android.cellbroadcast.x509.pem
new file mode 100644
index 000000000..d63129b0f
--- /dev/null
+++ b/apex/com.android.cellbroadcast.x509.pem
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGFzCCA/+gAwIBAgIUKMvh7Kl4WnjRidN84z/4QUlfTB0wDQYJKoZIhvcNAQEL
+BQAwgZkxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
+DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy
+b2lkMRYwFAYDVQQDDA1jZWxsYnJvYWRjYXN0MSEwHwYJKoZIhvcNAQkBFhJmaW9u
+YXh1QGdvb2dsZS5jb20wIBcNMTkxMTA1MDc0NTA2WhgPNDc1NzEwMDEwNzQ1MDZa
+MIGZMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwN
+TW91bnRhaW4gVmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9p
+ZDEWMBQGA1UEAwwNY2VsbGJyb2FkY2FzdDEhMB8GCSqGSIb3DQEJARYSZmlvbmF4
+dUBnb29nbGUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzIeJ
+ylmUZxL3YqnUpFN2sQiMa2z4OWPf9N3TNGOQ4cPXQ5NKOsJxlkZQ4jsSdRIHtfj/
+aKxylb3ba8E82P3LlI3iwebRu9DNUb9nhMfiz/XjptoJiJlbdEKg9Kz/+3n9gau0
+PltPplSHPJiV4GxCnLa8VT/6uYJJQePkANeX9eIM2cuUih2JVRfuP+UHb+xhoVHh
+Wbktxg+vM1GZP9rBus5zKuCTZXH/i46pMiUnD6bVKvk5h+29pfKdxf2HFN8xHEU/
+UNXcR6at9GgsWPNaExQty6z7gvrBzLIK6yeUMGr3XUlrVj8FEbIGI7NX2ZVR1nl+
+qdfKUtNO0o16MqypT6MjzULvKNSkSYQEayOBAmA4WNO5zUHmHHDax0XVk1t/hHBD
+SwAJadQDoRUGcTDFeaRG550cQxJ5z37YHeAQw3Sse+Ivur+3dRQvbJFMB5qArEFm
+VNuK9nMfgHteKM8KR0rLLBbM3SZOK/eOJhKVss7gc6bH5bmuG2KtBmfLB7ccTXka
+sXL9c0YQjBjuGJeXckBurhR3AgRlvOtfm+ShPAXqviHe1qqWPTNx5nivWhZMC2hr
+Q/oGhdXNd90KbfTuIAPR3eIWNJtSoQFk24A1HSQ9cPh04VYoehE7CQ5X//V2X7mf
+m+Cn0fp4Z9KnS9TEXmwWmNqAk2QgKascJMgCxEkCAwEAAaNTMFEwHQYDVR0OBBYE
+FPEmXGVIqBb0vffOX1Balr2mbaaeMB8GA1UdIwQYMBaAFPEmXGVIqBb0vffOX1Ba
+lr2mbaaeMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAF6krvo2
+63VyCssNvjlafVU2ZagnkBVv3I+t0uSouxoKwBq+g2sUg205toXSTVn7kd1PviSr
+hlVQRYO107G5Yf0iM/vmQaETmNuf4ka1w1EEVVrBCkBGcz6BUbWFacLIDkq7RBTJ
++ObBiva2ubu+4E8BYosKJ0o0v8GksFOEfENEAsRhK3Fm6CZEUzyz2ArN/+7GS33S
+1frzm59bRE3/glZvBUXSJPAKb4Gjo/CGM9+YEYW6m/i/yVLzYKUimjsRM0LmF6St
+GDi4V5li3dYcjGCykWiPiSpdhSiE2pvTFPKQuSis4AoSASbND2wW9u7o38CW+R9J
+TEd7sUPNSpWebX6H/SwPaEtswmjTSJ38Q88WzTOVswrZNAxK03V5NBE1uKquJpa7
+A9h0iIO3wyDzhhiQcXjUpqMztcJ7YxWJN7vn1zX/0zOTF90w+gkEfAcmNosVcnWL
+Bm96ZnzDRryWKCf/Pl/E9WQ0dqTyDqmcil5fNPhJqL+E46sSFohUIfeDn7uNYGIX
+wx8Dw0osVKiKQKwW/jd3Dcs6q2lMZo/SgGGaYzaXuaE0+W9vDaS/1Nrf6s4NtKSd
+QghjefZ6XczVjibr6+7YdiRLoEyXQDESRRmIC45zekX0Voj1hTl5Qq2nzphAu0/r
+YtqGsTzmKxajwWei9QCX9CkpA1D5RH+vHmLx
+-----END CERTIFICATE-----