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

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

Issue 29326170: Issue 3004 - Properly set the default search engine to Baidu for Chinese users (Closed)
Patch Set: Created Sept. 9, 2015, 12:27 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
« no previous file with comments | « abb-distribution/preferences.json ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 package:
11 $(INSTALL_DATA) $(topsrcdir)/abb-distribution/preferences.json $(DIST)/b in/distribution
11 $(topsrcdir)/adblockplus/build.py $(DIST)/bin/extensions/\{d10d0bf8-f5b5 -c8b4-a8b2-2b9879e08c5d\}.xpi 12 $(topsrcdir)/adblockplus/build.py $(DIST)/bin/extensions/\{d10d0bf8-f5b5 -c8b4-a8b2-2b9879e08c5d\}.xpi
12 @$(MAKE) -C mobile/android/installer 13 @$(MAKE) -C mobile/android/installer
13 14
14 ifeq ($(OS_TARGET),Android) 15 ifeq ($(OS_TARGET),Android)
15 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),) 16 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),)
16 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET) 17 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET)
17 endif 18 endif
18 ifneq ($(ANDROID_SERIAL),) 19 ifneq ($(ANDROID_SERIAL),)
19 export ANDROID_SERIAL 20 export ANDROID_SERIAL
20 else 21 else
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 $(CHECK_TEST_ERROR) 56 $(CHECK_TEST_ERROR)
56 57
57 mochitest:: mochitest-browser-chrome 58 mochitest:: mochitest-browser-chrome
58 59
59 .PHONY: mochitest-browser-chrome 60 .PHONY: mochitest-browser-chrome
60 endif 61 endif
61 62
62 ifeq ($(OS_TARGET),Linux) 63 ifeq ($(OS_TARGET),Linux)
63 deb: installer 64 deb: installer
64 endif 65 endif
OLDNEW
« no previous file with comments | « abb-distribution/preferences.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld