Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/build.mk

Issue 4540363985387520: Embed Adblock Plus (Closed)
Patch Set: Install as application scope extension Created Jan. 23, 2015, 11:20 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 # This Source Code Form is subject to the terms of the Mozilla Public 1 # This Source Code Form is subject to the terms of the Mozilla Public
2 # License, v. 2.0. If a copy of the MPL was not distributed with this 2 # License, v. 2.0. If a copy of the MPL was not distributed with this
3 # file, You can obtain one at http://mozilla.org/MPL/2.0/. 3 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
4 4
5 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk 5 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
6 6
7 installer: 7 installer:
8 @$(MAKE) -C mobile/android/installer installer 8 @$(MAKE) -C mobile/android/installer installer
9 9
10 package: 10 abp_source_dir=$(topsrcdir)/adblockplus
11 abp_xpi_file=\{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}.xpi
12 package_abp: $(abp_source_dir)
13 » 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 calle
Felix Dahlke 2015/02/19 10:54:14 Unfortunately not, the build process expects some
Wladimir Palant 2015/02/19 18:03:32 Yes, it is indeed a bug - while all the code works
Felix Dahlke 2015/02/19 20:32:09 Here we go :) https://issues.adblockplus.org/tick
14 » $(INSTALL_DATA) $(abp_source_dir)/$(abp_xpi_file) $(DIST)/bin/extensions
15
16 package: package_abp
Wladimir Palant 2015/02/18 17:54:01 Do we have to mess up this makefile? Won't creatin
Felix Dahlke 2015/02/19 10:54:14 /extensions doesn't have anything to do with the e
Wladimir Palant 2015/02/19 18:03:32 I know - it's build system extensions, meant for c
11 @$(MAKE) -C mobile/android/installer 17 @$(MAKE) -C mobile/android/installer
12 18
13 ifeq ($(OS_TARGET),Android) 19 ifeq ($(OS_TARGET),Android)
14 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),) 20 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),)
15 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET) 21 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET)
16 endif 22 endif
17 ifneq ($(ANDROID_SERIAL),) 23 ifneq ($(ANDROID_SERIAL),)
18 export ANDROID_SERIAL 24 export ANDROID_SERIAL
19 else 25 else
20 # Determine if there's more than one device connected 26 # Determine if there's more than one device connected
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 $(CHECK_TEST_ERROR) 60 $(CHECK_TEST_ERROR)
55 61
56 mochitest:: mochitest-browser-chrome 62 mochitest:: mochitest-browser-chrome
57 63
58 .PHONY: mochitest-browser-chrome 64 .PHONY: mochitest-browser-chrome
59 endif 65 endif
60 66
61 ifeq ($(OS_TARGET),Linux) 67 ifeq ($(OS_TARGET),Linux)
62 deb: installer 68 deb: installer
63 endif 69 endif
OLDNEW
« no previous file with comments | « mobile/android/base/distribution/Distribution.java ('k') | mobile/android/installer/package-manifest.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld