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 1229438 - Part 3: Update build. r=rnewman

Browse Source
This commit is contained in:
Nick Alexander 2015-12-01 10:56:09 -08:00
parent 8a78c06e29
commit f8b3ba19ac
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/app/base/build.gradle
View File

@ -31,6 +31,7 @@ android {
srcDir "${topsrcdir}/mobile/android/search/java"
srcDir "${topsrcdir}/mobile/android/javaaddons/java"
srcDir "${topsrcdir}/mobile/android/services/src/main/java"
if (mozconfig.substs.MOZ_ANDROID_MLS_STUMBLER) {
srcDir "${topsrcdir}/mobile/android/stumbler/java"
@ -65,6 +66,7 @@ android {
srcDir "${topsrcdir}/${mozconfig.substs.MOZ_BRANDING_DIRECTORY}/res"
srcDir "${project.buildDir}/generated/source/preprocessed_resources" // See syncPreprocessedResources.
srcDir "${topsrcdir}/mobile/android/base/resources"
srcDir "${topsrcdir}/mobile/android/services/src/main/res"
if (mozconfig.substs.MOZ_CRASHREPORTER) {
srcDir "${topsrcdir}/mobile/android/base/crashreporter/res"
}

8
mobile/android/base/android-services.mozbuild
View File

@ -763,7 +763,7 @@ sync_thirdparty_java_files = [
'org/mozilla/apache/commons/codec/StringEncoderComparator.java',
]
sync_java_files = [
sync_java_files = [TOPSRCDIR + '/mobile/android/services/src/main/java/org/mozilla/gecko/' + x for x in [
'background/BackgroundService.java',
'background/bagheera/BagheeraClient.java',
'background/bagheera/BagheeraRequestDelegate.java',
@ -1169,8 +1169,8 @@ sync_java_files = [
'tokenserver/TokenServerClientDelegate.java',
'tokenserver/TokenServerException.java',
'tokenserver/TokenServerToken.java',
]
reading_list_service_java_files = [
]]
reading_list_service_java_files = [TOPSRCDIR + '/mobile/android/services/src/main/java/org/mozilla/gecko/' + x for x in [
'reading/ClientMetadata.java',
'reading/ClientReadingListRecord.java',
'reading/FetchSpec.java',
@ -1195,4 +1195,4 @@ reading_list_service_java_files = [
'reading/ReadingListSyncService.java',
'reading/ReadingListWipeDelegate.java',
'reading/ServerReadingListRecord.java',
]
]]

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

@ -858,6 +858,7 @@ if CONFIG['MOZ_INSTALL_TRACKING']:
ANDROID_RES_DIRS += [
'/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
'resources',
'/mobile/android/services/src/main/res',
'!res',
]

5
mobile/android/gradle/base/build.gradle
View File

@ -30,6 +30,8 @@ android {
sourceSets {
main {
java {
srcDir 'src/services/java'
exclude 'org/mozilla/gecko/resources/**'
if (!mozconfig.substs.MOZ_CRASHREPORTER) {
@ -58,7 +60,8 @@ android {
}
res {
srcDir "src/branding/res"
srcDir 'src/branding/res'
srcDir 'src/services/res'
srcDir "${project.buildDir}/generated/source/preprocessed_resources" // See syncPreprocessedResources.
if (mozconfig.substs.MOZ_CRASHREPORTER) {
srcDir "src/crashreporter/res"

1
mobile/android/mach_commands.py
View File

@ -127,6 +127,7 @@ class MachCommands(MachCommandBase):
srcdir('base/src/main/java/org/mozilla/mozstumbler', 'mobile/android/stumbler/java/org/mozilla/mozstumbler')
srcdir('base/src/main/java/org/mozilla/search', 'mobile/android/search/java/org/mozilla/search')
srcdir('base/src/main/java/org/mozilla/javaaddons', 'mobile/android/javaaddons/java/org/mozilla/javaaddons')
srcdir('base/src/services', 'mobile/android/services/src/main')
srcdir('base/src/webrtc_audio_device/java', 'media/webrtc/trunk/webrtc/modules/audio_device/android/java/src')
srcdir('base/src/webrtc_video_capture/java', 'media/webrtc/trunk/webrtc/modules/video_capture/android/java/src')
srcdir('base/src/webrtc_video_render/java', 'media/webrtc/trunk/webrtc/modules/video_render/android/java/src')