wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1107811 - Part 2: Fix moz.build. r=mfinkle

Browse Source
This commit is contained in:
Nick Alexander 2015-12-04 12:02:06 -08:00
parent eecfaafe3d
commit 8d8594569e
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mobile/android/base/moz.build
View File

@ -12,7 +12,7 @@ include('android-services.mozbuild')
thirdparty_source_dir = TOPSRCDIR + '/mobile/android/thirdparty/' thirdparty_source_dir = TOPSRCDIR + '/mobile/android/thirdparty/'
constants_jar = add_java_jar('constants') constants_jar = add_java_jar('constants')
constants_jar.sources = [ constants_jar.sources = ['java/org/mozilla/gecko/' + x for x in [
'adjust/AdjustHelperInterface.java', 'adjust/AdjustHelperInterface.java',
'annotation/JNITarget.java', 'annotation/JNITarget.java',
'annotation/ReflectionTarget.java', 'annotation/ReflectionTarget.java',
@ -23,7 +23,7 @@ constants_jar.sources = [
'LocaleManager.java', 'LocaleManager.java',
'Locales.java', 'Locales.java',
'SysInfo.java', 'SysInfo.java',
] ]]
constants_jar.generated_sources = [ constants_jar.generated_sources = [
'preprocessed/org/mozilla/gecko/AdjustConstants.java', 'preprocessed/org/mozilla/gecko/AdjustConstants.java',
'preprocessed/org/mozilla/gecko/AppConstants.java', 'preprocessed/org/mozilla/gecko/AppConstants.java',
@ -35,16 +35,16 @@ constants_jar.extra_jars = [
] ]
if CONFIG['MOZ_INSTALL_TRACKING']: if CONFIG['MOZ_INSTALL_TRACKING']:
constants_jar.sources += [ constants_jar.sources += ['java/org/mozilla/gecko/' + x for x in [
'adjust/AdjustHelper.java', 'adjust/AdjustHelper.java',
] ]]
constants_jar.extra_jars = [ constants_jar.extra_jars = [
'gecko-thirdparty-adjust_sdk.jar', 'gecko-thirdparty-adjust_sdk.jar',
] ]
else: else:
constants_jar.sources += [ constants_jar.sources += ['java/org/mozilla/gecko/' + x for x in [
'adjust/StubAdjustHelper.java', 'adjust/StubAdjustHelper.java',
] ]]
resjar = add_java_jar('gecko-R') resjar = add_java_jar('gecko-R')
resjar.sources = [] resjar.sources = []
@ -72,7 +72,7 @@ if CONFIG['ANDROID_RECYCLERVIEW_V7_AAR']:
resjar.javac_flags += ['-Xlint:all'] resjar.javac_flags += ['-Xlint:all']
mgjar = add_java_jar('gecko-mozglue') mgjar = add_java_jar('gecko-mozglue')
mgjar.sources += [ mgjar.sources += ['java/org/mozilla/gecko/' + x for x in [
'mozglue/ByteBufferInputStream.java', 'mozglue/ByteBufferInputStream.java',
'mozglue/ContextUtils.java', 'mozglue/ContextUtils.java',
'mozglue/DirectBufferAllocator.java', 'mozglue/DirectBufferAllocator.java',
@ -80,7 +80,7 @@ mgjar.sources += [
'mozglue/JNIObject.java', 'mozglue/JNIObject.java',
'mozglue/NativeReference.java', 'mozglue/NativeReference.java',
'mozglue/NativeZip.java', 'mozglue/NativeZip.java',
] ]]
mgjar.generated_sources = [] # Keep it this way. mgjar.generated_sources = [] # Keep it this way.
mgjar.extra_jars += [ mgjar.extra_jars += [
'constants.jar', 'constants.jar',
@ -88,7 +88,7 @@ mgjar.extra_jars += [
mgjar.javac_flags += ['-Xlint:all'] mgjar.javac_flags += ['-Xlint:all']
gujar = add_java_jar('gecko-util') gujar = add_java_jar('gecko-util')
gujar.sources += [ gujar.sources += ['java/org/mozilla/gecko/' + x for x in [
'util/ActivityResultHandler.java', 'util/ActivityResultHandler.java',
'util/ActivityResultHandlerMap.java', 'util/ActivityResultHandlerMap.java',
'util/ActivityUtils.java', 'util/ActivityUtils.java',
@ -125,7 +125,7 @@ gujar.sources += [
'util/WeakReferenceHandler.java', 'util/WeakReferenceHandler.java',
'util/WebActivityMapper.java', 'util/WebActivityMapper.java',
'util/WindowUtils.java', 'util/WindowUtils.java',
] ]]
gujar.extra_jars = [ gujar.extra_jars = [
CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'], CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'], CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
@ -183,7 +183,7 @@ if CONFIG['MOZ_WEBRTC']:
wrjar.javac_flags += ['-Xlint:all,-deprecation,-cast'] wrjar.javac_flags += ['-Xlint:all,-deprecation,-cast']
gbjar = add_java_jar('gecko-browser') gbjar = add_java_jar('gecko-browser')
gbjar.sources += [ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
'AboutPages.java', 'AboutPages.java',
'AccountsHelper.java', 'AccountsHelper.java',
'ActionModeCompat.java', 'ActionModeCompat.java',
@ -617,11 +617,11 @@ gbjar.sources += [
'widget/TwoWayView.java', 'widget/TwoWayView.java',
'ZoomConstraints.java', 'ZoomConstraints.java',
'ZoomedView.java', 'ZoomedView.java',
] ]]
# The following sources are checked in to version control but # The following sources are checked in to version control but
# generated by a script (widget/themed/generate_themed_views.py). # generated by a script (java/org/mozilla/gecko/widget/themed/generate_themed_views.py).
# If you're editing this list, make sure to edit that script. # If you're editing this list, make sure to edit that script.
gbjar.sources += [ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
'widget/themed/ThemedEditText.java', 'widget/themed/ThemedEditText.java',
'widget/themed/ThemedFrameLayout.java', 'widget/themed/ThemedFrameLayout.java',
'widget/themed/ThemedImageButton.java', 'widget/themed/ThemedImageButton.java',
@ -631,7 +631,7 @@ gbjar.sources += [
'widget/themed/ThemedTextSwitcher.java', 'widget/themed/ThemedTextSwitcher.java',
'widget/themed/ThemedTextView.java', 'widget/themed/ThemedTextView.java',
'widget/themed/ThemedView.java', 'widget/themed/ThemedView.java',
] ]]
gbjar.sources += [ thirdparty_source_dir + f for f in [ gbjar.sources += [ thirdparty_source_dir + f for f in [
'com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java', 'com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java',
'com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java', 'com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java',
@ -646,7 +646,7 @@ gbjar.extra_jars += [
'constants.jar' 'constants.jar'
] ]
if CONFIG['MOZ_CRASHREPORTER']: if CONFIG['MOZ_CRASHREPORTER']:
gbjar.sources += [ 'CrashReporter.java' ] gbjar.sources += [ 'java/org/mozilla/gecko/CrashReporter.java' ]
ANDROID_RES_DIRS += [ 'crashreporter/res' ] ANDROID_RES_DIRS += [ 'crashreporter/res' ]
if (CONFIG['MOZ_ANDROID_MAX_SDK_VERSION']): if (CONFIG['MOZ_ANDROID_MAX_SDK_VERSION']):
@ -657,12 +657,12 @@ else:
# Only bother to include new tablet code if we're building for tablet-capable # Only bother to include new tablet code if we're building for tablet-capable
# OS releases. # OS releases.
if max_sdk_version >= 11: if max_sdk_version >= 11:
gbjar.sources += [ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
'tabs/TabStrip.java', 'tabs/TabStrip.java',
'tabs/TabStripAdapter.java', 'tabs/TabStripAdapter.java',
'tabs/TabStripItemView.java', 'tabs/TabStripItemView.java',
'tabs/TabStripView.java' 'tabs/TabStripView.java'
] ]]
# Selectively include reading list service code. # Selectively include reading list service code.
if CONFIG['MOZ_ANDROID_READING_LIST_SERVICE']: if CONFIG['MOZ_ANDROID_READING_LIST_SERVICE']:
@ -685,12 +685,12 @@ moz_native_devices_jars = [
CONFIG['ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB'], CONFIG['ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB'],
CONFIG['ANDROID_PLAY_SERVICES_CAST_AAR_LIB'], CONFIG['ANDROID_PLAY_SERVICES_CAST_AAR_LIB'],
] ]
moz_native_devices_sources = [ moz_native_devices_sources = ['java/org/mozilla/gecko/' + x for x in [
'ChromeCast.java', 'ChromeCast.java',
'GeckoMediaPlayer.java', 'GeckoMediaPlayer.java',
'MediaPlayerManager.java', 'MediaPlayerManager.java',
'PresentationMediaPlayerManager.java', 'PresentationMediaPlayerManager.java',
] ]]
if CONFIG['MOZ_NATIVE_DEVICES']: if CONFIG['MOZ_NATIVE_DEVICES']:
gbjar.extra_jars += moz_native_devices_jars gbjar.extra_jars += moz_native_devices_jars
gbjar.sources += moz_native_devices_sources gbjar.sources += moz_native_devices_sources