commit dd1de72b5d5a8cb74ea308006dac1fdf54caedfa
author Jiyong Park <jiyong@google.com> Sat May 18 21:34:13 2019 +0900
committer Anton Hansson <hansson@google.com> Tue Jul 02 13:43:44 2019 +0000
tree 542c5b94c8b463870dc705851105c288e5ecc5c6
parent eb1328c4c798e4c7c26c3b23b2d45592f5b84274

Bonito/Sargo supports updatable APEX

Before, updatable_apex.mk was inherited indirectly from
mainline_system.mk. Since mainline_system.mk no longer inherits
updatable_apex.mk, updatable_apex.mk is inherited directly from
device-specific mk file.

Bug: 132664085
Test: choosecombo to bonito and sargo; get_build_var TARGET_FLATTEN_APEX
shows false

Change-Id: I0a0923da157ec87bd139883e14a948466a134554
Merged-In: I0a0923da157ec87bd139883e14a948466a134554
(cherry picked from commit 38b571e78693f7cc7703ddb8a592ae3ca0bdd32b)

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 2ff1ccf..12e9441 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -21,6 +21,9 @@
 # define hardware platform
 PRODUCT_PLATFORM := sdm670
 
+# Enable updating of APEXes
+$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
+
 include device/google/bonito/device-audio-mfg.mk
 include device/google/bonito/device.mk