Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cleanup embedlite make files
  • Loading branch information
tmeshkova committed Nov 5, 2014
1 parent d289926 commit aaf1e47
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 28 deletions.
29 changes: 1 addition & 28 deletions embedding/embedlite/Makefile.in
Expand Up @@ -2,33 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

LOCAL_INCLUDES += \
-I$(srcdir)/utils \
-I$(srcdir)/modules \
-I$(srcdir)/embedhelpers \
-I$(srcdir)/embedthread \
-I$(topsrcdir)/widget/xpwidgets \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/dom/ipc \
-I$(topsrcdir)/js/xpconnect/src \
-I$(topsrcdir)/gfx/layers/apz/util \
$(NULL)

DEFINES += -DEMBED_LITE_INTERNAL=1

DEFINES += \
-DOS_TARGET=\"$(OS_TARGET)\" \
-DMOZ_WIDGET_TOOLKIT=\"$(MOZ_WIDGET_TOOLKIT)\"

ifdef TARGET_XPCOM_ABI
DEFINES += \
-DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\" \
-DTARGET_OS_ABI=\"$(OS_TARGET)_$(TARGET_XPCOM_ABI)\" \
$(NULL)
endif

PREF_JS_EXPORTS = $(srcdir)/embedding.js

GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
DEFINES += \
-DGRE_BUILDID=\"$(GRE_BUILDID)\"
DEFINES += -DGRE_BUILDID=\"$(GRE_BUILDID)\"
15 changes: 15 additions & 0 deletions embedding/embedlite/moz.build
Expand Up @@ -66,8 +66,23 @@ IPDL_SOURCES += [
]

LOCAL_INCLUDES += [
'/dom/base',
'/dom/ipc',
'/gfx/layers',
'/gfx/layers/apz/util',
'/js/xpconnect/src',
'/widget',
'embedhelpers',
'embedthread',
'modules',
'utils',
]

DEFINES['EMBED_LITE_INTERNAL'] = True
DEFINES['OS_TARGET'] = '"%s"' % (CONFIG['OS_TARGET'])
DEFINES['MOZ_WIDGET_TOOLKIT'] = '"%s"' % (CONFIG['MOZ_WIDGET_TOOLKIT'])
if CONFIG['TARGET_XPCOM_ABI']:
DEFINES['TARGET_OS_ABI'] = '"%s_%s"' % (CONFIG['OS_TARGET'],
CONFIG['TARGET_XPCOM_ABI'])

include('/ipc/chromium/chromium-config.mozbuild')

0 comments on commit aaf1e47

Please sign in to comment.