Merge "Include cpufeatures in ndk/Android.mk" into froyo

1d0df82b · Brian Muramatsu · Android (Google) Code Review · 32c6d02b · 026530ee · 1d0df82b
Commit 1d0df82b authored 15 years ago by Brian Muramatsu Committed by Android (Google) Code Review 15 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Android.mk Android.mk +3 -3

No files found.
--- a/Android.mk
+++ b/Android.mk
-# Please keep this file empty. It is only used to avoid breaking the Android build
-# when the NDK sources are stored in the git repository alongside the rest of the
-# platform.
+# Please try to keep this file empty by only including what is necessary to
+# build the Android platform. This is not the normal usage of the NDK.
+include ndk/sources/cpufeatures/Android.mk