summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2021-06-01 23:40:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-01 23:40:52 +0000
commit28e36d9cde4ef42ca17c18a2256266eb858f0d62 (patch)
tree532b4432ccf2b0e2c7feed3ca7ab70233f0a099f
parentf0dbd542c546f426c399ee1dc7d9a8f28aa8a936 (diff)
parent7b200341f4eeb5eb9204688a31153a16c8b0cecd (diff)
downloadGki-28e36d9cde4ef42ca17c18a2256266eb858f0d62.tar.gz
5.4 is also unstable. am: 927a4d2385 am: 1240a45929 am: 7b200341f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Gki/+/1715265 Change-Id: I1baa02182ece5b271cc590424788ade93bd1cd81
-rw-r--r--Android.bp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 8777da1..eb7729b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -108,12 +108,12 @@ cc_binary_host {
],
}
-// Build GKI APEX 5.4-android12-0 from $(PRODUCT_OUT)/boot.img.
+// Build GKI APEX 5.4-android12-unstable from $(PRODUCT_OUT)/boot.img.
// Also generate test packages.
gki_apex {
- name: "com.android.gki.kmi_5_4_android12_0",
+ name: "com.android.gki.kmi_5_4_android12_unstable",
installable: true,
- kmi_version: "5.4-android12-0",
+ kmi_version: "5.4-android12-unstable",
product_out_path: "boot.img",
gen_test: true,
}
@@ -128,11 +128,11 @@ gki_apex {
gen_test: true,
}
-// Build GKI APEX 5.4-android12-0 from $(PRODUCT_OUT)/boot-5.4.img
+// Build GKI APEX 5.4-android12-unstable from $(PRODUCT_OUT)/boot-5.4.img
gki_apex {
- name: "com.android.gki.kmi_5_4_android12_0_boot-5.4",
+ name: "com.android.gki.kmi_5_4_android12_unstable_boot-5.4",
installable: false,
- kmi_version: "5.4-android12-0",
+ kmi_version: "5.4-android12-unstable",
product_out_path: "boot-5.4.img",
}
@@ -149,8 +149,8 @@ gki_apex {
filegroup {
name: "gki_install_test_files",
srcs: [
- ":com.android.gki.kmi_5_4_android12_0_test_high",
- ":com.android.gki.kmi_5_4_android12_0_test_low",
+ ":com.android.gki.kmi_5_4_android12_unstable_test_high",
+ ":com.android.gki.kmi_5_4_android12_unstable_test_low",
":com.android.gki.kmi_5_10_android12_unstable_test_high",
":com.android.gki.kmi_5_10_android12_unstable_test_low",
],