Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab2b34b8 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Use framework.aidl built by Soong"

parents a8abd3be 50bf3127

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -620,6 +620,8 @@ $(call add-clean-step, find $(PRODUCT_OUT) -type f -name "generated_*_image_info 


# Clean up libicuuc.so and libicui18n.so

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libicu*)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ aidl_preprocess_import := 
ifdef LOCAL_SDK_VERSION

ifneq ($(filter current system_current test_current core_current, $(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS_USE_PREBUILT_SDK)),)

  # LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS

  aidl_preprocess_import := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl

  aidl_preprocess_import := $(FRAMEWORK_AIDL)

else

  aidl_preprocess_import := $(call resolve-prebuilt-sdk-aidl-path,$(LOCAL_SDK_VERSION))

endif # not current or system_current