Merge "Add an init service for setting sdk props" am: 6a8eaf415d

am: 49aa386a67 Change-Id: I2bfac06d596a0dc57975033a0bf1a4d61965153c
2019-12-06 05:40:39 -08:00
parent cb5307627f 49aa386a67
commit 6606c53996
3 changed files with 10 additions and 0 deletions
--- a/apex/sdkext/Android.bp
+++ b/apex/sdkext/Android.bp
@@ -20,6 +20,7 @@ apex {
    prebuilts: [
      "com.android.sdkext.ldconfig",
      "cur_sdkinfo",
+      "derive_sdk.rc",
    ],
    key: "com.android.sdkext.key",
    certificate: ":com.android.sdkext.certificate",
--- a/apex/sdkext/derive_sdk/Android.bp
+++ b/apex/sdkext/derive_sdk/Android.bp
@@ -29,3 +29,9 @@ cc_binary {
        "libprotobuf-cpp-lite-ndk",
    ],
 }
+
+prebuilt_etc {
+    name: "derive_sdk.rc",
+    src: "derive_sdk.rc",
+    installable: false,
+}
--- a/apex/sdkext/derive_sdk/derive_sdk.rc
+++ b/apex/sdkext/derive_sdk/derive_sdk.rc
@@ -0,0 +1,3 @@
+service derive_sdk /apex/com.android.sdkext/bin/derive_sdk
+    oneshot
+    disabled