| commit | dd2d71dc87602fe4929ffb8471d4302edbcd8b3e | [log] [tgz] |
|---|---|---|
| author | Yo Chiang <yochiang@google.com> | Wed Jun 24 11:51:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 11:51:10 2020 +0000 |
| tree | c98714e204c3ca1919f1e24f5587b8386d3b972c | |
| parent | dd19bb0b548cf088a54a5b41c7f0ea53035c265f [diff] | |
| parent | 5f1f6e0b69eb57227483cddab92570069b768fef [diff] |
Merge "Revert "Fix makefile include hierarchy"" am: 6d65666280 am: 26bdf7774d am: bfc2c62309 am: 3bb3e06153 am: 5f1f6e0b69 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1348363 Change-Id: Ib09c000f064e90f4dba6d8856398418a340e3933
diff --git a/media/codec2/Android.mk b/media/codec2/Android.mk index 17f28ff..82d739f 100644 --- a/media/codec2/Android.mk +++ b/media/codec2/Android.mk
@@ -45,4 +45,4 @@ .PHONY: docs-all docs-all: docs-api docs-internal -include $(call first-makefiles-under,$(call my-dir)) +include $(call all-makefiles-under,$(call my-dir))