summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbohu <bohu@google.com>2018-08-02 12:55:41 -0700
committerBo Hu <bohu@google.com>2018-08-02 22:50:13 +0000
commitee28af438c5a4a1e50c4f97a283edaac1665f02c (patch)
tree252a00bb13430db5c082a405df45bda1724191b8
parent4cfac19bbd3c6ff03ed0b15eae4346154af362d5 (diff)
downloadandroid_device_generic_goldfish-ee28af438c5a4a1e50c4f97a283edaac1665f02c.tar.gz
android_device_generic_goldfish-ee28af438c5a4a1e50c4f97a283edaac1665f02c.tar.bz2
android_device_generic_goldfish-ee28af438c5a4a1e50c4f97a283edaac1665f02c.zip
goldfish: re-enable shipping api level
For x86 and x86_64 aosp/sdk images only This wont impact wear and other products that only include emulator.mk BUG: 111989951 Change-Id: Ie68a4f3683aa1c152aa058a48392038aaf7b09d8 Merged-In: Ie68a4f3683aa1c152aa058a48392038aaf7b09d8
-rw-r--r--vendor.mk2
-rw-r--r--x86-vendor.mk2
-rw-r--r--x86_64-vendor.mk2
3 files changed, 4 insertions, 2 deletions
diff --git a/vendor.mk b/vendor.mk
index 328b847..958b309 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -17,8 +17,6 @@
# This file is to configure vendor/data partitions of emulator-related products
#
-PRODUCT_SHIPPING_API_LEVEL := 24
-
# Device modules
PRODUCT_PACKAGES += \
gralloc.goldfish \
diff --git a/x86-vendor.mk b/x86-vendor.mk
index 22e6ec7..2ee7f1b 100644
--- a/x86-vendor.mk
+++ b/x86-vendor.mk
@@ -11,3 +11,5 @@ PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \
prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu-64
+PRODUCT_SHIPPING_API_LEVEL := 28
+TARGET_USES_MKE2FS := true
diff --git a/x86_64-vendor.mk b/x86_64-vendor.mk
index 2aa61c9..66d46f9 100644
--- a/x86_64-vendor.mk
+++ b/x86_64-vendor.mk
@@ -11,3 +11,5 @@ PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \
prebuilts/qemu-kernel/x86_64/4.9/kernel-qemu2:kernel-ranchu
+PRODUCT_SHIPPING_API_LEVEL := 28
+TARGET_USES_MKE2FS := true