summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiajia tang <tangjiajia@xiaomi.com>2022-06-22 23:32:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-22 23:32:59 +0000
commite1253d124c9101b8d1daa9df916651253ee875a6 (patch)
treeb9f12e640080b3a76cb44e407a749b054f30b2db
parent8466ade7f9fce92bb1ef8c6fd3dc01968bdf68b9 (diff)
parent392d7b84d8cd44c98f9b0a7173fade9803f5beb4 (diff)
downloadGki-e1253d124c9101b8d1daa9df916651253ee875a6.tar.gz
reset to sh_binary for com.android.gki.preinstall am: 52b5cecf1e am: eeeed87449 am: 392d7b84d8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Gki/+/2121373 Change-Id: I77e44933241e37f13354140962a8db91ca74f289 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp10
1 files changed, 2 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index eb7729b..509ffa3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,16 +61,10 @@ apex_key {
private_key: "com.android.gki.pem",
}
-// Use cc_prebuilt_binary because sh_binary does not support product_specific.
-// TODO(b/169954965): Change to sh_binary when product_specific is supported.
-cc_prebuilt_binary {
+sh_binary {
name: "com.android.gki.preinstall",
product_specific: true,
- srcs: ["preinstall.sh"],
- apex_available: ["com.android.gki.*"],
- strip: {
- none: true,
- },
+ src: "preinstall.sh",
}
// Common defaults for all GKI APEXes.