From ff172bbbc7edadb34a8c5e3a09037f9cfdd1c726 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Wed, 4 Dec 2019 16:06:41 +0000
Subject: [PATCH] Add an init service for setting sdk props

Add a oneshot init service, to be triggered early in the boot.
This is unlikely to be the permanent solution, but allows us
to get off the ground by at least getting the prop set.

Bug: 137191822
Test: m com.android.sdkext
Test: boot && adb shell getprop | grep sdk_info
Change-Id: I253c56961289d1226f3a9a471e7b6ca047c52a4e
---
 apex/sdkext/Android.bp               | 1 +
 apex/sdkext/derive_sdk/Android.bp    | 6 ++++++
 apex/sdkext/derive_sdk/derive_sdk.rc | 3 +++
 3 files changed, 10 insertions(+)
 create mode 100644 apex/sdkext/derive_sdk/derive_sdk.rc

diff --git a/apex/sdkext/Android.bp b/apex/sdkext/Android.bp
index b132f7e3ff4c5..40f3c45518bbf 100644
--- 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",
diff --git a/apex/sdkext/derive_sdk/Android.bp b/apex/sdkext/derive_sdk/Android.bp
index 39f1943bfa790..c4e3c296f2108 100644
--- 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,
+}
diff --git a/apex/sdkext/derive_sdk/derive_sdk.rc b/apex/sdkext/derive_sdk/derive_sdk.rc
new file mode 100644
index 0000000000000..1b667949eeaa2
--- /dev/null
+++ b/apex/sdkext/derive_sdk/derive_sdk.rc
@@ -0,0 +1,3 @@
+service derive_sdk /apex/com.android.sdkext/bin/derive_sdk
+    oneshot
+    disabled