diff options
| author | Jiyong Park <jiyong@google.com> | 2019-05-06 10:22:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-06 10:22:54 -0700 |
| commit | b8fca9280d8a46b44a025e70c726212d31c2f478 (patch) | |
| tree | 6f4a6e7ccfebf8ba45cfc9291be3deccdbf1d388 | |
| parent | 844d65efe8a7514986908951ad50430f0f8c2405 (diff) | |
| parent | 5e25df9f5a1a2ab8dc84f5088517507f1c5a3980 (diff) | |
| download | build-b8fca9280d8a46b44a025e70c726212d31c2f478.tar.gz | |
Merge "Don't inherit updatable_apex from mainline_system"
am: 5e25df9f5a
Change-Id: Ib14e1439146fa2a07bec43bb87a2e2334b1be7ea
| -rw-r--r-- | target/product/mainline_system.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index 66207dfe32..87393d4050 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -19,7 +19,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk) # Enable updating of APEXes -$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) +#$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) # Add adb keys to debuggable AOSP builds (if they exist) $(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk) |