mobile/android/build.mk - Issue 6302236728623104: Add Adblock Plus API

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 6302236728623104: Add Adblock Plus API (Closed)

Patch Set: Created March 13, 2015, 10:15 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

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 abp_source_dir=$(topsrcdir)/adblockplus	10 package_abp:

11 abp_xpi_file=\{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}.xpi	11 » $(MKDIR) -p $(DIST)/bin/extensions

12 package_abp: $(abp_source_dir)	12 » PYTHONPATH="$(topsrcdir)/adblockplus/adblockplus" $(topsrcdir)/adblockpl us/build.py build $(DIST)/bin/extensions/\{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\ }.xpi
	Felix Dahlke 2015/03/13 22:22:37 Was hoping this would get a lot less hacky, but it Was hoping this would get a lot less hacky, but it got only a little less hacky. I looked a bit into moving this into a Makefile, but I'd rather tackle that later (follow up for that is: https://trello.com/c/FFcSMEd2/50-find-a-less-intrusive-way-of-integrating-abp...)
13 » cd $(abp_source_dir); ./build.py build $(abp_xpi_file)

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

15	13

16 package: package_abp	14 package: package_abp

17 @$(MAKE) -C mobile/android/installer	15 @$(MAKE) -C mobile/android/installer

18	16

19 ifeq ($(OS_TARGET),Android)	17 ifeq ($(OS_TARGET),Android)

20 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),)	18 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),)

21 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET)	19 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET)

22 endif	20 endif

23 ifneq ($(ANDROID_SERIAL),)	21 ifneq ($(ANDROID_SERIAL),)

24 export ANDROID_SERIAL	22 export ANDROID_SERIAL

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 $(CHECK_TEST_ERROR)	58 $(CHECK_TEST_ERROR)

61	59

62 mochitest:: mochitest-browser-chrome	60 mochitest:: mochitest-browser-chrome

63	61

64 .PHONY: mochitest-browser-chrome	62 .PHONY: mochitest-browser-chrome

65 endif	63 endif

66	64

67 ifeq ($(OS_TARGET),Linux)	65 ifeq ($(OS_TARGET),Linux)

68 deb: installer	66 deb: installer

69 endif	67 endif

OLD	NEW

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