| Index: mobile/android/installer/package-manifest.in |
| =================================================================== |
| --- a/mobile/android/installer/package-manifest.in |
| +++ b/mobile/android/installer/package-manifest.in |
| @@ -25,16 +25,21 @@ |
| @BINPATH@/defaults/profile/chrome/* |
| @BINPATH@/update.locale |
| #ifdef MOZ_UPDATER |
| @BINPATH@/updater.ini |
| #endif |
| @BINPATH@/dictionaries/* |
| @BINPATH@/hyphenation/* |
| +; Placing embedded extensions in assets/extensions/* |
| +; See https://issues.adblockplus.org/ticket/5426 |
| +[assets destdir="assets"] |
| +@BINPATH@/extensions/* |
| + |
| [assets destdir="assets/@ANDROID_CPU_ARCH@"] |
| #ifndef MOZ_STATIC_JS |
| @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ |
| #endif |
| #ifdef MOZ_DMD |
| @BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@ |
| #endif |
| #ifndef MOZ_FOLD_LIBS |
| @@ -85,17 +90,16 @@ |
| @BINPATH@/AndroidManifest.xml |
| @BINPATH@/resources.arsc |
| @BINPATH@/package-name.txt |
| @BINPATH@/classes.dex |
| @BINPATH@/res/drawable |
| @BINPATH@/res/drawable-hdpi |
| @BINPATH@/res/layout |
| -@BINPATH@/extensions/* |
| [browser] |
| ; [Base Browser Files] |
| #ifndef XP_UNIX |
| @BINPATH@/@MOZ_APP_NAME@.exe |
| #else |
| @BINPATH@/@MOZ_APP_NAME@-bin |
| @BINPATH@/@MOZ_APP_NAME@ |