diff options
| author | 2020-04-30 05:53:38 +0000 | |
|---|---|---|
| committer | 2020-04-30 05:55:58 +0000 | |
| commit | 41a6e3b02f3a6d0d0b321f70c40100d2c6fd2eae (patch) | |
| tree | 7cae12778ff5ced551dae6178784cd1bf67538e2 | |
| parent | a780171da671d1316e4e36628a82cca7f05fb397 (diff) | |
Revert "remove emulator_vendor.mk from aosp_arm64.mk"
This reverts commit a780171da671d1316e4e36628a82cca7f05fb397.
Reason for revert: This appears to be causing intermittent build
failures. Vendor is now small enough that sometimes it does not
get enough inodes allocated for the files that must be copied to it.
Bug: 155340761
Change-Id: I453101a65d4c8b5824467d0bb7cc8c3a03ca2740
| -rw-r--r-- | target/product/aosp_arm64.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index e14effc334..3254ccf061 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -48,8 +48,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) # $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) -PRODUCT_FULL_TREBLE_OVERRIDE := true - +# +# All components inherited here go to vendor or vendor_boot image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) # |