diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-11-03 18:37:49 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-11-03 18:37:49 -0800 |
| commit | 0cc963c66334acbcaef7f50c2415080b56c60c78 (patch) | |
| tree | 498e4d22ce6f8f373fd86c63c2ccd089998930ec /tools/aapt | |
| parent | 3fd340028fc24198edb23ddf5eb5a0a100bab745 (diff) | |
| download | frameworks_base-0cc963c66334acbcaef7f50c2415080b56c60c78.zip frameworks_base-0cc963c66334acbcaef7f50c2415080b56c60c78.tar.gz frameworks_base-0cc963c66334acbcaef7f50c2415080b56c60c78.tar.bz2 | |
Fix build due to bad merge
- tools/aapt/qsort_r_compat.c was removed
and the merge added it back to the src list in Android.mk
Change-Id: I15aae8adc68f82ac2381020ac0b96a7b1ab59f9c
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 2eb7424..b20cb0b 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -36,7 +36,6 @@ aaptSources := \ Images.cpp \ Package.cpp \ pseudolocalize.cpp \ - qsort_r_compat.c \ Resource.cpp \ ResourceFilter.cpp \ ResourceIdCache.cpp \ |