diff options
| author | 2019-04-21 17:20:17 +0000 | |
|---|---|---|
| committer | 2019-04-21 17:20:17 +0000 | |
| commit | ab2b34b8fd6c7c9e97ea96ea629ff5c4372840eb (patch) | |
| tree | 57241295231726680c531a4fd74f2462443dcdcd | |
| parent | a8abd3beb791f2098ed439e1a39b1e506210a02d (diff) | |
| parent | 50bf3127d97fb68903e4ebf579999770c1574048 (diff) | |
Merge "Use framework.aidl built by Soong"
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | core/java.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 757c513a4c..ac2599605e 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/core/java.mk b/core/java.mk index 66431e952c..40fa594b92 100644 --- a/core/java.mk +++ b/core/java.mk @@ -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 |