Bug 1001611 - Use MOZ_APP_NAME instead of hardcoded 'fennec' in mobile/android. r=nalexander
authorNathan Toone <nathan@toonetown.com>
Sat, 26 Apr 2014 11:27:00 -0400
changeset 198936 585be2b04378c1e7becd879a95a986d80d8d991e
parent 198935 7dd1a04ced802e373c9c894d56c6aeffbcf05c75
child 198937 4dc6cd04f8ff871cf32ac8d96b295a37a7125efe
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1001611
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1001611 - Use MOZ_APP_NAME instead of hardcoded 'fennec' in mobile/android. r=nalexander
mobile/android/base/moz.build
mobile/android/geckoview_library/Makefile.in
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -552,18 +552,18 @@ main.filtered_resources += [
 
 main.recursive_make_targets += ['.aapt.deps'] # Captures dependencies on Android manifest and all resources.
 main.recursive_make_targets += [OBJDIR + '/generated/' + f for f in mgjar.generated_sources]
 main.recursive_make_targets += [OBJDIR + '/generated/' + f for f in gbjar.generated_sources]
 
 main.included_projects += ['../' + generated.name, '../' + branding.name]
 main.referenced_projects += [generated.name, branding.name]
 main.extra_jars += [CONFIG['ANDROID_COMPAT_LIB']]
-main.assets = TOPOBJDIR + '/dist/fennec/assets'
-main.libs = TOPOBJDIR + '/dist/fennec/lib'
+main.assets = TOPOBJDIR + '/dist/' + CONFIG['MOZ_APP_NAME'] + '/assets'
+main.libs = TOPOBJDIR + '/dist/' + CONFIG['MOZ_APP_NAME'] + '/lib'
 main.res = None
 
 cpe = main.add_classpathentry('src', SRCDIR,
     dstdir='src/org/mozilla/gecko',
     exclude_patterns=['org/mozilla/gecko/tests/**',
         'org/mozilla/gecko/resources/**'])
 if not CONFIG['MOZ_CRASHREPORTER']:
     cpe.exclude_patterns += ['org/mozilla/gecko/CrashReporter.java']
--- a/mobile/android/geckoview_library/Makefile.in
+++ b/mobile/android/geckoview_library/Makefile.in
@@ -31,17 +31,17 @@ include $(topsrcdir)/config/rules.mk
 
 _ABS_DIST = $(abspath $(DIST))
 
 package: local.properties project.properties AndroidManifest.xml FORCE
 	# Make directory for the zips
 	$(MKDIR) -p $(_ABS_DIST)/geckoview_library
 
 	# Zip the assets into $(DIST)/geckoview_library/geckoview_assets.zip
-	cd $(_ABS_DIST)/fennec && \
+	cd $(_ABS_DIST)/$(MOZ_APP_NAME) && \
 	$(ZIP) -q -r $(_ABS_DIST)/geckoview_library/geckoview_assets.zip assets
 
 	# Make empty directories to fit an Android project structure
 	$(MKDIR) -p bin gen libs/$(ANDROID_CPU_ARCH) src
 
 	# Copy the JARs, except for the jar containing org.mozilla.gecko.R.
 	# org.mozilla.gecko.R will be provided by the embedding application.
 	cp $(DEPTH)/mobile/android/base/*.jar libs/