Embed Adblock Plus

mobile/android/build.mk

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include  $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 installer:
         @$(MAKE) -C mobile/android/installer installer
 
-# abp_source_dir=$(topsrcdir)/adblockplus

[Felix Dahlke, 2014/12/05 19:22:24]

Ignore changes to this file please, we don't need to touch it for the extensions
mechanism.

-# abp_xpi_file=\{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}.xpi
-# package_abp: $(abp_source_dir)
-#       cd $(abp_source_dir); ./build.py build $(abp_xpi_file)
-#       $(INSTALL_DATA) $(abp_source_dir)/$(abp_xpi_file) $(DIST)/bin/distribution/extensions
+abp_source_dir=$(topsrcdir)/adblockplus
+abp_xpi_file=\{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}.xpi
+package_abp: $(abp_source_dir)
+        cd $(abp_source_dir); ./build.py build $(abp_xpi_file)

[Wladimir Palant, 2015/02/18 17:54:01]

No need to change directory, build.py can be called from anywhere:

$(abp_source_dir)/build.py build $(DIST)/bin/extensions/$(abp_xpi_file)

[Felix Dahlke, 2015/02/19 10:54:14]

Unfortunately not, the build process expects some stuff in the cwd (e.g. the
dependencies file and metadata.gecko). Seems a bit like a bug to me actually,
but I wasn't sure if it's supposed to work. That'd allow us to simplify the code
here quite a bit, but I'd rather not have this blocked.

[Wladimir Palant, 2015/02/19 18:03:32]

Yes, it is indeed a bug - while all the code works with any directory, our
build.py boilerplate passes in '.' as basedir :-(

[Felix Dahlke, 2015/02/19 20:32:09]

Here we go :)

https://issues.adblockplus.org/ticket/2020

+        $(INSTALL_DATA) $(abp_source_dir)/$(abp_xpi_file) $(DIST)/bin/extensions
 
-# package: package_abp
-package:
+package: package_abp

[Wladimir Palant, 2015/02/18 17:54:01]

Do we have to mess up this makefile? Won't creating a directory under
/extensions with our own build instructions work as well?
--enable-extensions=adblockplus needs to be specified but that should be fine.

[Felix Dahlke, 2015/02/19 10:54:14]

/extensions doesn't have anything to do with the extensions directory that ends
up in the APK - the former has native extensions (not add ons), definitely the
wrong place for us IMO.

Secondly, modifying that makefile is the only way I've found to add this to the
package phase, rather than the build phase. I think it belongs there, and it
gives us a faster turnaround.

[Wladimir Palant, 2015/02/19 18:03:32]

I know - it's build system extensions, meant for custom build steps. And here we
have one.
While technically this might be true, it will also make updates more
complicated. But that's up to you.

         @$(MAKE) -C mobile/android/installer
 
 ifeq ($(OS_TARGET),Android)
 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),)
 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET)
 endif
 ifneq ($(ANDROID_SERIAL),)
 export ANDROID_SERIAL
 else
 # Determine if there's more than one device connected
@@ skipping 33 matching lines @@
         $(CHECK_TEST_ERROR)
 
 mochitest:: mochitest-browser-chrome
 
 .PHONY: mochitest-browser-chrome
 endif
 
 ifeq ($(OS_TARGET),Linux)
 deb: installer
 endif