mobile/android/build.mk - Issue 6238034718621696: Issue 2483 - Give Adblock Browser its own app ID

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 6238034718621696: Issue 2483 - Give Adblock Browser its own app ID (Closed)

Patch Set: Created May 14, 2015, 3:21 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 package_abp:	10 package:

11 » $(MKDIR) -p $(DIST)/bin/extensions	11 » $(topsrcdir)/adblockplus/build.py $(DIST)/bin/extensions/\{d10d0bf8-f5b5 -c8b4-a8b2-2b9879e08c5d\}.xpi
	Felix Dahlke 2015/05/14 15:24:52 Seemed like a good opportunity to make our change Seemed like a good opportunity to make our change here less intrusive and move most of the logic to build.py.
12 » PYTHONPATH="$(topsrcdir)/adblockplus/adblockplus" $(topsrcdir)/adblockpl us/build.py build $(DIST)/bin/extensions/\{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\ }.xpi

13

14 package: package_abp

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

16	13

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

18 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),)	15 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),)

19 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET)	16 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET)

20 endif	17 endif

21 ifneq ($(ANDROID_SERIAL),)	18 ifneq ($(ANDROID_SERIAL),)

22 export ANDROID_SERIAL	19 export ANDROID_SERIAL

23 else	20 else

24 # Determine if there's more than one device connected	21 # Determine if there's more than one device connected

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

59	56

60 mochitest:: mochitest-browser-chrome	57 mochitest:: mochitest-browser-chrome

61	58

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

63 endif	60 endif

64	61

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

66 deb: installer	63 deb: installer

67 endif	64 endif

OLD	NEW

« adblockplus/build.py ('K') | « adblockplus/issue-2510.patch ('k') | mobile/android/confvars.sh » ('j') | no next file with comments »