mobile/android/build.mk - Issue 4540363985387520: Embed Adblock Plus

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

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

Issue 4540363985387520: Embed Adblock Plus (Closed)

Patch Set: Get rid of distribute_abp, add ABP as subrepository Created Nov. 30, 2014, 6:10 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
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)

	14 » $(INSTALL_DATA) $(abp_source_dir)/$(abp_xpi_file) $(DIST)/bin/distributi on/extensions

	15

	16 package: package_abp

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 Loading...
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

OLD	NEW

« no previous file with comments | « .hgsubstate ('k') | no next file » | no next file with comments »