summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2019-12-06 05:34:35 -0800
committer android-build-merger <android-build-merger@google.com> 2019-12-06 05:34:35 -0800
commit49aa386a67c44d10344869a5dda3efe5c91a13c5 (patch)
tree6202457e8d1df360522c0fb93d902b7ac67b001a
parent21699364c4dd1b0c4e853160400a59244a32e965 (diff)
parent6a8eaf415d61525d604377e641532951ba26ca1d (diff)
Merge "Add an init service for setting sdk props"
am: 6a8eaf415d Change-Id: Icd111732d68c14a2ecf301d1b9d1ef308e10baac
-rw-r--r--apex/sdkext/Android.bp1
-rw-r--r--apex/sdkext/derive_sdk/Android.bp6
-rw-r--r--apex/sdkext/derive_sdk/derive_sdk.rc3
3 files changed, 10 insertions, 0 deletions
diff --git a/apex/sdkext/Android.bp b/apex/sdkext/Android.bp
index b132f7e3ff4c..40f3c45518bb 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 39f1943bfa79..c4e3c296f210 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 000000000000..1b667949eeaa
--- /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