diff options
| author | Colin Cross <ccross@android.com> | 2018-02-09 11:24:14 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-02-09 11:29:15 -0800 |
| commit | fdbe7d1ca90ac40f9b629524d9aea26e59899c50 (patch) | |
| tree | 136ed4bf0b85a3bf73654be606a1c1385e8072a3 /Android.mk | |
| parent | 4c8fa81d177bfd2f144ebe153df74edb8b332f5a (diff) | |
Don't put android.os.Parcelable in framework.aidl
Parcelable shouldn't be in the list of parcelables in framework.aidl.
Remove it to fix warning when running aidl:
framework.aidl:287 attempt to redefine built in class android.os.Parcelable
Also make the dependency on sdk_parcelables not be order-only so
framework.aidl gets rebuilt when sdk_parcelables changes.
Bug: 73135791
Test: ParcelableDetectorTest
Test: out/target/common/obj/framework.aidl does not contain android.os.Parcelable
Change-Id: If5222879be9ec1e5fa08810adc624ec526ddc0ec
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index ea75b19c7ff8..71720a1740a5 100644 --- a/Android.mk +++ b/Android.mk @@ -36,7 +36,7 @@ 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 + $$(gen): $(call java-lib-header-files,$1) $(HOST_OUT_EXECUTABLES)/sdkparcelables @echo Extract SDK parcelables: $$@ rm -f $$@ $(HOST_OUT_EXECUTABLES)/sdkparcelables $$< $$@ |