Side by Side Diff: mobile/android/build.mk
Issue 4540363985387520:
Embed Adblock Plus (Closed)
Patch Set: WIP - Use the extensions directory
Created Dec. 5, 2014, 7:16 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« extensions/adblockplus/moz.build ('k')
|
mobile/android/installer/package-manifest.in » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 # abp_source_dir=$(topsrcdir)/adblockplus |
|
Felix Dahlke
2014/12/05 19:22:24
Ignore changes to this file please, we don't need
| |
| 11 abp_xpi_file=\{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}.xpi | 11 # abp_xpi_file=\{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}.xpi |
| 12 package_abp: $(abp_source_dir) | 12 # package_abp: $(abp_source_dir) |
| 13 » cd $(abp_source_dir); ./build.py build $(abp_xpi_file) | 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 | 14 # » $(INSTALL_DATA) $(abp_source_dir)/$(abp_xpi_file) $(DIST)/bin/distributi on/extensions |
| 15 | 15 |
| 16 package: package_abp | 16 # package: package_abp |
| 17 package: | |
| 17 @$(MAKE) -C mobile/android/installer | 18 @$(MAKE) -C mobile/android/installer |
| 18 | 19 |
| 19 ifeq ($(OS_TARGET),Android) | 20 ifeq ($(OS_TARGET),Android) |
| 20 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),) | 21 ifneq ($(MOZ_ANDROID_INSTALL_TARGET),) |
| 21 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET) | 22 ANDROID_SERIAL = $(MOZ_ANDROID_INSTALL_TARGET) |
| 22 endif | 23 endif |
| 23 ifneq ($(ANDROID_SERIAL),) | 24 ifneq ($(ANDROID_SERIAL),) |
| 24 export ANDROID_SERIAL | 25 export ANDROID_SERIAL |
| 25 else | 26 else |
| 26 # Determine if there's more than one device connected | 27 # Determine if there's more than one device connected |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 $(CHECK_TEST_ERROR) | 61 $(CHECK_TEST_ERROR) |
| 61 | 62 |
| 62 mochitest:: mochitest-browser-chrome | 63 mochitest:: mochitest-browser-chrome |
| 63 | 64 |
| 64 .PHONY: mochitest-browser-chrome | 65 .PHONY: mochitest-browser-chrome |
| 65 endif | 66 endif |
| 66 | 67 |
| 67 ifeq ($(OS_TARGET),Linux) | 68 ifeq ($(OS_TARGET),Linux) |
| 68 deb: installer | 69 deb: installer |
| 69 endif | 70 endif |
| OLD | NEW |
« no previous file with comments
|
« extensions/adblockplus/moz.build ('k')
|
mobile/android/installer/package-manifest.in » ('j')
|
no next file with comments »
