Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-31 19:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset cc4d456a02e7 (bug 1065306) for breaking Android nightlys

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-09-24 08:30:54 +02:00
parent 9a9fa74bf6
commit e98fb275d5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/base/locales/Makefile.in
View File

@ -28,16 +28,16 @@ strings-xml-in := $(srcdir)/../strings.xml.in
GARBAGE += $(strings-xml)
dir-res-raw := ../res/raw
suggestedsites := $(dir-res-raw)/suggestedsites.json
dir-res-raw := ../res/raw
suggestedsites-json := $(dir-res-raw)/suggestedsites.json
GARBAGE += \
$(suggestedsites) \
$(suggestedsites-json) \
$(NULL)
libs realchrome:: \
$(strings-xml) \
$(suggestedsites) \
$(suggestedsites-json) \
$(NULL)
chrome-%:: AB_CD=$*
@ -98,11 +98,11 @@ suggestedsites-srcdir := $(if $(filter en-US,$(AB_CD)),,$(or $(realpath $(L10NBA
# Determine the ../res/raw[-*] path. This can be ../res/raw when no
# locale is explicitly specified.
suggestedsites-bypath = $(filter %/suggestedsites.json,$(MAKECMDGOALS))
ifeq (,$(strip $(suggestedsites-bypath)))
suggestedsites-bypath = $(suggestedsites)
suggestedsites-json-bypath = $(filter %/suggestedsites.json,$(MAKECMDGOALS))
ifeq (,$(strip $(suggestedsites-json-bypath)))
suggestedsites-json-bypath = $(suggestedsites-json)
endif
suggestedsites-dstdir-raw = $(patsubst %/,%,$(dir $(suggestedsites-bypath)))
suggestedsites-dstdir-raw = $(patsubst %/,%,$(dir $(suggestedsites-json-bypath)))
$(suggestedsites-dstdir-raw)/suggestedsites.json: FORCE
$(call py_action,generate_suggestedsites, \