diff options
| author | Brian Muramatsu <btmura@google.com> | 2010-06-07 12:13:05 -0700 |
|---|---|---|
| committer | Brian Muramatsu <btmura@google.com> | 2010-06-08 11:03:19 -0700 |
| commit | 026530eefc7386cf268e8da042d4f3f73c3a6b63 (patch) | |
| tree | bd8bdc84103d485fe96969cd2531430230d59b63 /Android.mk | |
| parent | f2f883c9f5d1057b585f2490ffb12800d166e9f4 (diff) | |
| download | ndk-026530eefc7386cf268e8da042d4f3f73c3a6b63.tar.gz | |
Include cpufeatures in ndk/Android.mk
Bug 2713199
Include the cpufeatures Android.mk since this library will be needed
by CTS to test the Build.CPU_ABI constants. This approach is favored
over putting the include line in the CTS tests Android.mk.
Change-Id: I350cdb82351174f6dd91b7f77fb8e0ece00a9090
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 1ce424de3..12291da1c 100644 --- a/Android.mk +++ b/Android.mk @@ -1,3 +1,3 @@ -# 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 |