Revert "universal8895: build updateable apex"

This reverts commit 6b53117f6b42ed34ba29d47e25917619b701b6ee.

Revert "universal8895: build apex image"

This reverts commit 0430d033ae6ac6e3c39db3e705423fc0d063cd9e.

Change-Id: I8d5f6961f6b0a835c8d281e9e3ba484a3313c4de

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index f9597fce0b0211260e9deca1187ed29c72848b77..78459299d07f3200b17a4461d8b12ce8817bcbf0 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -51,9 +51,6 @@ TARGET_2ND_CPU_VARIANT := cortex-a53.a57
 # Binder
 TARGET_USES_64_BIT_BINDER := true
 
-# Apex
-DEXPREOPT_GENERATE_APEX_IMAGE := true
-
 # Extracted with libbootimg
 BOARD_CUSTOM_BOOTIMG := true
 TARGET_KERNEL_ADDITIONAL_FLAGS := HOSTCFLAGS="-fuse-ld=lld -Wno-unused-command-line-argument"

diff --git a/device-common.mk b/device-common.mk
index 51414acfae0d9692f60cb55125ffc7cfb7b43658..8f483c6d289d13c6193db5dbe2f5bf389e15c613 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -340,8 +340,5 @@ PRODUCT_PACKAGES += \
 # Properties
 -include $(LOCAL_PATH)/system_prop.mk
 
-# Apex
-$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
-
 # call the proprietary setup
 $(call inherit-product, vendor/samsung/universal8895-common/universal8895-common-vendor.mk)