From b9cb74b048da94f469240db4e31f41494e3302aa Mon Sep 17 00:00:00 2001 From: Colin Cross <ccross@android.com> Date: Thu, 18 Apr 2019 12:09:34 -0700 Subject: [PATCH] Remove framework.aidl rules They are now located in build/soong/java/sdk.go. Bug: 130798034 Bug: 122332340 Test: m checkbuild Change-Id: I4e8ee725e660e52aa56c2a10b626dff517669869 Merged-In: I4e8ee725e660e52aa56c2a10b626dff517669869 (cherry picked from commit 196fa2947e7182ea2d19675af55920b3170ddf7c) --- Android.mk | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/Android.mk b/Android.mk index c58f7af1d7d5f..9bda2dc6d69ae 100644 --- a/Android.mk +++ b/Android.mk @@ -32,27 +32,6 @@ ifneq ($(ANDROID_BUILD_EMBEDDED),true) # ============================================================ include $(CLEAR_VARS) -aidl_parcelables := -define stubs-to-aidl-parcelables - gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/$1.aidl - aidl_parcelables += $$(gen) - $$(gen): $(call java-lib-header-files,$1) $(HOST_OUT_EXECUTABLES)/sdkparcelables - @echo Extract SDK parcelables: $$@ - rm -f $$@ - $(HOST_OUT_EXECUTABLES)/sdkparcelables $$< $$@ -endef - -$(foreach stubs,android_stubs_current android_test_stubs_current android_system_stubs_current,\ - $(eval $(call stubs-to-aidl-parcelables,$(stubs)))) - -gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl -.KATI_RESTAT: $(gen) -$(gen): $(aidl_parcelables) - @echo Combining SDK parcelables: $@ - rm -f $@.tmp - cat $^ | sort -u > $@.tmp - $(call commit-change-for-toc,$@) - # This is used by ide.mk as the list of source files that are # always included. INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document)) -- GitLab