diff options
| author | Tao Bao <tbao@google.com> | 2016-03-03 11:43:47 -0800 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2016-03-03 14:52:44 -0800 |
| commit | d80a99883d5ae2b117c54f076fe1df7eae86d2f8 (patch) | |
| tree | 14a10ad17192f2a7ead609af81d2445d80ed117f /applypatch/main.cpp | |
| parent | 5ffc038be6cffd9155fce4f2212ff351415ee7ba (diff) | |
| download | android_bootable_recovery-d80a99883d5ae2b117c54f076fe1df7eae86d2f8.tar.gz android_bootable_recovery-d80a99883d5ae2b117c54f076fe1df7eae86d2f8.tar.bz2 android_bootable_recovery-d80a99883d5ae2b117c54f076fe1df7eae86d2f8.zip | |
Fix the improper use of LOCAL_WHOLE_STATIC_LIBRARIES.
If two libraries both use LOCAL_WHOLE_STATIC_LIBRARIES and include a same
library, there would be linking errors when generating a shared library
(or executable) that depends on the two libraries both.
Also clean up Android.mk files.
Remove the "LOCAL_MODULE_TAGS := eng" line for the updater module. The
module will then default to "optional" which won't be built until needed.
Change-Id: I3ec227109b8aa744b7568e7f82f575aae3fe0e6f
Diffstat (limited to 'applypatch/main.cpp')
| -rw-r--r-- | applypatch/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/applypatch/main.cpp b/applypatch/main.cpp index 9013760c..0ff8cbf9 100644 --- a/applypatch/main.cpp +++ b/applypatch/main.cpp @@ -22,7 +22,7 @@ #include <memory> #include <vector> -#include "applypatch.h" +#include "applypatch/applypatch.h" #include "edify/expr.h" #include "openssl/sha.h" |